More translation updates

As always, I am not the author, just pulling into Subsurface.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

19 files changed, 3674 insertions, 3420 deletions

diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts
index 9c7e54f36..e16522614 100644
--- a/translations/subsurface_bg_BG.ts
+++ b/translations/subsurface_bg_BG.ts
@@ -75,57 +75,57 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation>Големина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <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="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation>Модел</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation>Прякор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <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="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
         <translation type="unfinished"/>
     </message>
@@ -193,87 +193,87 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <source>merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <source>merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation type="unfinished"/>
     </message>
@@ -405,67 +405,67 @@ Please, remove them first.</source>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation>макс CNS</translation>
     </message>
@@ -538,16 +538,24 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <source>Dive Notes</source>
         <translation>Бележки</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
@@ -587,212 +595,222 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation>Видимост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation>Водолазен костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation>Бележки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation>Екипировка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation>Време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation>Статистики</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation>Температура:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation>Общо време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation>Гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Бутилки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation>Запиши</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation>С</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation>Ю</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation>И</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation>З</translation>
     </message>
@@ -1165,7 +1183,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </message>
@@ -1175,7 +1193,7 @@ Please, remove them first.</source>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
@@ -1185,7 +1203,7 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
@@ -1614,106 +1632,106 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation>Редактирай</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>въздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Връщане към OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> начало</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> край</translation>
@@ -1722,72 +1740,72 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -1805,16 +1823,11 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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/globe.cpp" line="251"/>
-        <source>Editing dive - 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>
@@ -1948,17 +1961,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
@@ -1966,7 +1979,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -1974,12 +1987,12 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
@@ -2025,17 +2038,17 @@ Please, remove them first.</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation>Тежест</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation type="unfinished"/>
     </message>
@@ -2043,70 +2056,70 @@ Please, remove them first.</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"/>
diff --git a/translations/subsurface_ca_ES.ts b/translations/subsurface_ca_ES.ts
index 196b6e19c..d5b2c9d5f 100644
--- a/translations/subsurface_ca_ES.ts
+++ b/translations/subsurface_ca_ES.ts
@@ -75,57 +75,57 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <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="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <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="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
         <translation type="unfinished"/>
     </message>
@@ -193,87 +193,87 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <source>merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <source>merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation type="unfinished"/>
     </message>
@@ -405,67 +405,67 @@ Please, remove them first.</source>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation type="unfinished"/>
     </message>
@@ -538,16 +538,24 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <source>Dive Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation type="unfinished"/>
     </message>
@@ -587,212 +595,222 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation type="unfinished"/>
     </message>
@@ -1165,7 +1183,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </message>
@@ -1175,7 +1193,7 @@ Please, remove them first.</source>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
@@ -1185,7 +1203,7 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
@@ -1614,106 +1632,106 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"/>
@@ -1722,72 +1740,72 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -1805,16 +1823,11 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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/globe.cpp" line="251"/>
-        <source>Editing dive - 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"/>
@@ -1948,17 +1961,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation type="unfinished"/>
     </message>
@@ -1966,7 +1979,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -1974,12 +1987,12 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
@@ -2025,17 +2038,17 @@ Please, remove them first.</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation type="unfinished"/>
     </message>
@@ -2043,70 +2056,70 @@ Please, remove them first.</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"/>
diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts
index 1afc80e1a..c3546f4f4 100644
--- a/translations/subsurface_da_DK.ts
+++ b/translations/subsurface_da_DK.ts
@@ -75,57 +75,57 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <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="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation>Kaldenavn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <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="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
         <translation type="unfinished"/>
     </message>
@@ -193,87 +193,87 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <source>merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <source>merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation type="unfinished"/>
     </message>
@@ -405,67 +405,67 @@ Please, remove them first.</source>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation>fod</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation>min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation>pund (lbs)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation type="unfinished"/>
     </message>
@@ -538,16 +538,24 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <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="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
@@ -587,212 +595,222 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation>Sigtbarhed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation>Dragt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation>Noter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation>Udstyr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation>Dyk info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation>Dykker Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation>Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Flasker </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation>Gem</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation>V</translation>
     </message>
@@ -1165,7 +1183,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </message>
@@ -1175,7 +1193,7 @@ Please, remove them first.</source>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
@@ -1185,7 +1203,7 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
@@ -1614,106 +1632,106 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Bailing out to OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>start</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>slut</translation>
@@ -1722,72 +1740,72 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -1805,16 +1823,11 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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/globe.cpp" line="251"/>
-        <source>Editing dive - 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>Luk</translation>
@@ -1948,17 +1961,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1966,7 +1979,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -1974,12 +1987,12 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2025,17 +2038,17 @@ Please, remove them first.</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation>Vægt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation type="unfinished"/>
     </message>
@@ -2043,70 +2056,70 @@ Please, remove them first.</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"/>
diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts
index ac12795fb..7c45b559a 100644
--- a/translations/subsurface_de_CH.ts
+++ b/translations/subsurface_de_CH.ts
@@ -75,57 +75,57 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation>Grösse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
         <translation>max. Fülldruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
         <translation>Druck vorh.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
         <translation>Druck nachh.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation>O₂%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation>Wechsel bei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Hier klicken entfernt diese Flasche.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flasche kann nicht entfernt werden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <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="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation>Gerätebezeichnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation>Gerätename</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <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="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation> l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
         <translation> cuft/min</translation>
     </message>
@@ -193,87 +193,87 @@
         <translation>Suchfeld anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
         <translation>Sichtbar:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation>Alle ausklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation>Alle einklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation>Andere einklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>remove dive(s) from trip</source>
         <translation>Entferne Tauchgang aus Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
         <translation>Neue Reise darüber einfügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <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="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <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="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <source>merge trip with trip below</source>
         <translation>Reise mit der Reise darunter verbinden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
         <translation>Tauchgang löschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
         <translation>Als UDDF exportieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
         <translation>Zeiten verschieben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation>Speichere Tauchgänge als...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation>Datei speichern als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation>Ausgewählte Tauchgänge zusammenführen</translation>
     </message>
@@ -406,67 +406,67 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
         <translation>Tauchplatz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation>max. CNS</translation>
     </message>
@@ -539,16 +539,24 @@ Bitte entferne diese zuerst.</translation>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation>Ausgewählte Tauchplätze bearbeiten</translation>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <source>Dive Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
@@ -588,212 +596,222 @@ Bitte entferne diese zuerst.</translation>
         <translation>Stichworte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation>Sicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation>Ausrüstung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation>Informationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation>Oberflächenpause</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
         <translation>Verw. Gase</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
         <translation>Verbrauchtes Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation>Ø Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
         <translation>Luftdruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation>Wassertemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
         <translation>Salzgehalt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation>Gesamtzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation>Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Flaschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Flasche hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Gewichte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Gewichtsystem hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation>Reise Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation>Reise Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation>Diese Reise wird bearbeitet. Drücke Speichern oder Abbrechen, wenn Du fertig bist.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation>Speichern</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <source>This trip is being edited.</source>
+        <translation>Diese Reise wird bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation>Mehrere Tauchgänge werden bearbeitet. Drücke Speichern oder Abbrechen, wenn Du fertig bist.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <source>Multiple dives are being edited.</source>
+        <translation>Mehrere Tauchgänge werden bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation>Dieser Tauchgang wird bearbeitet. Drücke Speichern oder Abbrechen, wenn Du fertig bist.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <source>This dive is being edited.</source>
+        <translation>Dieser Tauchgang wird bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -1166,7 +1184,7 @@ Bitte entferne diese zuerst.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation>Datei speichern als</translation>
     </message>
@@ -1176,7 +1194,7 @@ Bitte entferne diese zuerst.</translation>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
@@ -1186,7 +1204,7 @@ Bitte entferne diese zuerst.</translation>
         <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1271,7 +1289,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Personalize</source>
-        <translation>Personalisieren</translation>
+        <translation>Personalisiert</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="297"/>
@@ -1615,106 +1633,106 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
         <translation>Gaswechsel setzen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
         <translation>Markierung setzen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
         <translation>Entferne Ereigniss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
         <translation>Ähnliche Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation>Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation>Alle %1 Ereignisse ausblenden?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation>Ausgewähltes Ereignis entfernen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation>Unbekannter Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation>Setze Dauer: 10 Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation>Massstab</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation>Lineal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation>Eigenschaften der Tauchgangssegmente messen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation>Tauchgang auf Bildschirmgrösse skalieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Notausstieg mit offenem System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> Anfang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> Ende</translation>
@@ -1723,72 +1741,72 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
         <translation>Tauchgang Nr %1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
         <translation>max Tiefe: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
         <translation>Dauer: %1 Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
         <translation>Verw. Gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
         <translation>Gewichte:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
         <translation>Anzug:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
         <translation>Sicht:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
         <translation>Bewertung:</translation>
     </message>
@@ -1806,16 +1824,11 @@ Bitte entferne diese zuerst.</translation>
         <translation>Diesen Punkt entfernen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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/globe.cpp" line="251"/>
-        <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation>Tauchgang wird editiert - Karte verschieben und Tauchplatz mit Doppelklick markieren</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Schliessen</translation>
@@ -1949,17 +1962,17 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1967,7 +1980,7 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
@@ -1975,12 +1988,12 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2026,17 +2039,17 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation>Hier klicken entfernt dieses Gewichtssystem.</translation>
     </message>
@@ -2044,79 +2057,79 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Jahr 
  &gt; Monat / Trip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation>Dauer
 Gesamt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation>
 Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation>
 Kürzester</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation>
 Längster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation>Tiefe (%1)
  Durchschnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
  Durchschnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts
index 816770ab9..9ef247384 100644
--- a/translations/subsurface_de_DE.ts
+++ b/translations/subsurface_de_DE.ts
@@ -75,57 +75,57 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
         <translation>max. Fülldruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
         <translation>Druck vorh.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
         <translation>Druck nachh.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation>O₂%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation>Wechsel bei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Hier klicken entfernt diese Flasche.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flasche kann nicht entfernt werden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <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="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation>Gerätebezeichnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation>Gerätename</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <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="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
         <translation>cuft/min</translation>
     </message>
@@ -193,87 +193,87 @@
         <translation>Suchfeld anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
         <translation>Sichtbar:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation>Alle ausklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation>Alle einklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation>Andere einklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>remove dive(s) from trip</source>
         <translation>Entferne Tauchgang aus Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
         <translation>Neue Reise darüber einfügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <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="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <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="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <source>merge trip with trip below</source>
         <translation>Reise mit der Reise darunter verbinden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
         <translation>Tauchgang löschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
         <translation>Als UDDF exportieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
         <translation>Zeiten verschieben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation>Speichere Tauchgänge als...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation>Datei speichern als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation>Ausgewählte Tauchgänge zusammenführen</translation>
     </message>
@@ -406,67 +406,67 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
         <translation>Tauchplatz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation>AMV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation>max. CNS</translation>
     </message>
@@ -539,16 +539,24 @@ Bitte entferne diese zuerst.</translation>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation>Ausgewählte Tauchplätze bearbeiten</translation>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <source>Dive Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
@@ -588,212 +596,222 @@ Bitte entferne diese zuerst.</translation>
         <translation>Stichworte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation>Sicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation>Ausrüstung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation>Informationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation>Oberflächenpause</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
         <translation>Verw. Gase</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
         <translation>Verbrauchtes Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation>AMV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation>Ø Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
         <translation>Luftdruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation>Wassertemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
         <translation>Salzgehalt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation>Gesamtzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation>Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Flaschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Flasche hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
-        <translation>Gewichte</translation>
+        <translation>Blei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Gewichtsystem hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation>Reise Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation>Reise Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation>Diese Reise wird bearbeitet. Drücke Speichern oder Abbrechen, wenn Du fertig bist.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation>Speichern</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <source>This trip is being edited.</source>
+        <translation>Diese Reise wird bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation>Mehrere Tauchgänge werden bearbeitet. Drücke Speichern oder Abbrechen, wenn Du fertig bist.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <source>Multiple dives are being edited.</source>
+        <translation>Mehrere Tauchgänge werden bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation>Dieser Tauchgang wird bearbeitet. Drücke Speichern oder Abbrechen, wenn Du fertig bist.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <source>This dive is being edited.</source>
+        <translation>Dieser Tauchgang wird bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -1122,7 +1140,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
-        <translation>Info zu Subsurface</translation>
+        <translation>Über Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
@@ -1166,7 +1184,7 @@ Bitte entferne diese zuerst.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation>Datei speichern als</translation>
     </message>
@@ -1176,7 +1194,7 @@ Bitte entferne diese zuerst.</translation>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
@@ -1186,7 +1204,7 @@ Bitte entferne diese zuerst.</translation>
         <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1241,17 +1259,17 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="187"/>
         <source>Display Invalid</source>
-        <translation>Anzeige ungültig</translation>
+        <translation>Zeige auch ungültige?</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="204"/>
         <source>Default Cylinder</source>
-        <translation>Standard Flasche</translation>
+        <translation>Standardflasche</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="210"/>
         <source>Use Default Cylinder</source>
-        <translation>Benutze Standard Flasche</translation>
+        <translation>Wähle Deine Standardflasche(n)</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="246"/>
@@ -1266,7 +1284,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Imperial</source>
-        <translation>Imperial</translation>
+        <translation>Zöllig</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="273"/>
@@ -1388,7 +1406,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="541"/>
         <source>pN2</source>
-        <translation>pN2</translation>
+        <translation>pN₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="582"/>
@@ -1428,7 +1446,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="738"/>
         <source>3m increments</source>
-        <translation>3m Inkremente</translation>
+        <translation>3m Stufen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="748"/>
@@ -1615,106 +1633,106 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
         <translation>Gaswechsel setzen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
         <translation>Markierung setzen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
         <translation>Entferne Ereigniss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
         <translation>Ähnliche Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation>Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation>Alle %1 Ereignisse ausblenden?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation>Ausgewähltes Ereignis entfernen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation>Unbekannter Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation>Setze Dauer: 10 Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation>Maßstab</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation>Lineal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation>Eigenschaften der Tauchgangssegmente messen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation>Tauchgang auf Bildschirmgrößem skalieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Notausstieg mit offenem System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> Anfang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> Ende</translation>
@@ -1723,72 +1741,72 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
         <translation>Tauchgang Nr %1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
         <translation>max Tiefe: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
         <translation>Dauer: %1 Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
         <translation>Verw. Gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
         <translation>AMV:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
-        <translation>Gewichte:</translation>
+        <translation>Blei:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
         <translation>Tauchgruppenleiter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
         <translation>Partner:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
         <translation>Anzug:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
         <translation>Sicht:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
         <translation>Bewertung:</translation>
     </message>
@@ -1806,16 +1824,11 @@ Bitte entferne diese zuerst.</translation>
         <translation>Diesen Punkt entfernen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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/globe.cpp" line="251"/>
-        <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation>Tauchgang wird editiert - Karte verschieben und Tauchplatz mit Doppelklick markieren</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Schließen</translation>
@@ -1949,17 +1962,17 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1967,7 +1980,7 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
@@ -1975,12 +1988,12 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2026,17 +2039,17 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation>Hier klicken entfernt dieses Gewichtssystem.</translation>
     </message>
@@ -2044,79 +2057,79 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Jahr 
  &gt; Monat / Trip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation>Dauer
 Gesamt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation>
 Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation>
 Kürzester</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation>
 Längster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation>Tiefe (%1)
  Durchschnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation>AMV (%1)
  Durchschnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -2920,12 +2933,12 @@ Auftauchzeit:%umin (berechnet)</translation>
     <message>
         <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
-        <translation>%dt %dst %dmin</translation>
+        <translation>%dt %dh %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
-        <translation>%dst %dmin</translation>
+        <translation>%dh %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="233"/>
diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts
index 04df6fec4..930a8b4ac 100644
--- a/translations/subsurface_es_ES.ts
+++ b/translations/subsurface_es_ES.ts
@@ -75,57 +75,57 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
-        <translation>Presión de trabajo</translation>
+        <translation>Pres. trabajo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
-        <translation>Presión inicial</translation>
+        <translation>Pres. inicial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
-        <translation>Presión final</translation>
+        <translation>Pres. final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation>O2%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation>Cambiar a </translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Pulsar aquí borrará esta botella</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation>La botella no puede borrarse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <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="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation>Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation>ID del dispositivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <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="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
         <translation>Pie³/min</translation>
     </message>
@@ -194,87 +194,87 @@ ordenador seleccionado ?</translation>
         <translation>Mostrar ventana de busqueda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
         <translation>Visible:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation>Expandir todo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation>Encoger todo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation>Encoger otros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>remove dive(s) from trip</source>
-        <translation>borrar inmersión(es) del viaje</translation>
+        <translation>Borrar inmersión(es) del viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
-        <translation>crear nuevo viaje arriba</translation>
+        <translation>Crear nuevo viaje arriba</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <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="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <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="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <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="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
-        <translation>borrar inmersión(es)</translation>
+        <translation>Borrar inmersión(es)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
         <translation>Guardar como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
-        <translation>exportar como UDDF</translation>
+        <translation>Exportar como UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
-        <translation>Variar horas</translation>
+        <translation>Desplazar horas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation>Guardar las inmersiones como ...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation>Guardar archivo como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Archivos UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation>Mezclar las inmersiones seleccionadas</translation>
     </message>
@@ -407,67 +407,67 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
-        <translation>fecha</translation>
+        <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
         <translation>traje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
         <translation>bot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
-        <translation>ubicación</translation>
+        <translation>Ubicación</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -540,16 +540,24 @@ Por favor, bórralas antes.</translation>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <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="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation>Ubicación</translation>
     </message>
@@ -589,212 +597,222 @@ Por favor, bórralas antes.</translation>
         <translation>Etiquetas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation>Valoración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation>Visibilidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation>Traje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation>Equipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation>Información de la inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation>Intervalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
         <translation>Gases usados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
         <translation>Gas consumido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation>Profundidad máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation>Profundidad media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
         <translation>Presión atmosférica</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation>Temperatura del aire</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation>Temperatura del agua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation>Duración de la inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
         <translation>Salinidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation>Estadísticas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation>Tiempo total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation>Inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Botellas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Añadir botella</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Lastre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Añadir sistema de lastre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation>Ubicación del viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation>Notas del viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation>Este viaje se está editando. Selecciona Guardar o Cancelar cuando termines.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation>Guardar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <source>This trip is being edited.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation>Se estan editando multiples inmersiones. Selecciona Guardar o Cancelar cuando termines.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <source>Multiple dives are being edited.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation>Esta inmersión se está editando. Selecciona Guardar o Cancelar cuando termines.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <source>This dive is being edited.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation>O</translation>
     </message>
@@ -1167,7 +1185,7 @@ Por favor, bórralas antes.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation>Guardar archivo como</translation>
     </message>
@@ -1177,7 +1195,7 @@ Por favor, bórralas antes.</translation>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation>Advertencia</translation>
     </message>
@@ -1187,7 +1205,7 @@ Por favor, bórralas antes.</translation>
         <translation>Archivos UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1616,106 +1634,106 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
         <translation>Añadir cambio de gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
         <translation>Añadir marcador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
         <translation>Borrar evento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
         <translation>Ocultar eventos similares</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation>Ocultar eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation>¿ Ocultar todos los eventos %1 ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation>¿ Borrar el evento seleccionado ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation>Ordenador desconocido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation>Fijar duración: 10 minutos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation>Escala</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation>Regla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation>Medir propiedades de segmentos de la inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation>escalar la inmersión al tamaño de pantalla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>aire</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Cambio de emergencia a OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>comienzo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>fin</translation>
@@ -1724,72 +1742,72 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
         <translation>Inmersión #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
         <translation>Profundidad máxima: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
         <translation>Duración: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
         <translation>Gas usado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
         <translation>CAS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
         <translation>Lastre:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
         <translation>Compañero:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
         <translation>Traje:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
         <translation>Visibilidad:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
         <translation>Calificación:</translation>
     </message>
@@ -1807,16 +1825,11 @@ Por favor, bórralas antes.</translation>
         <translation>Borrar este punto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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>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/globe.cpp" line="251"/>
-        <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation>Editando la inmersión - mueve el mapa y haz doble clic para fijar la posición del buceo</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Cerrar</translation>
@@ -1855,12 +1868,12 @@ Por favor, bórralas antes.</translation>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="20"/>
         <source>Shift selected times</source>
-        <translation>Variar las horas seleccionadas</translation>
+        <translation>Desplazar las horas seleccionadas</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="37"/>
         <source>Shift times of selected dives by</source>
-        <translation>Variar las horas de las inmersiones seleccionadas en</translation>
+        <translation>Desplazar las horas de las inmersiones seleccionadas en</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="73"/>
@@ -1950,17 +1963,17 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1968,7 +1981,7 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Información</translation>
     </message>
@@ -1976,12 +1989,12 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2027,17 +2040,17 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation>Pulsar aquí borrará este sistema de lastre.</translation>
     </message>
@@ -2045,79 +2058,79 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Año
 &gt; Mes / Viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation>Duración
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation>
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation>
 Más corta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation>
 Más larga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation>Profundidad (%1)
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
         <translation>
 Mínimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
         <translation>
 Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation>CAS (%1)
 Medio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -2591,7 +2604,7 @@ basado en GFbajo = %.0f  y  GFalto = %.0f
         <source>%s
 P:%d %s</source>
         <translation>%s
-P:%d %s</translation>
+Pres:%d %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
@@ -2633,7 +2646,7 @@ Parada de seguridad:%umin @ %.0f %s</translation>
         <source>@:%d:%02d
 D:%.1f %s</source>
         <translation>@:%d:%02d
-P:%.1f %s</translation>
+Prof:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
@@ -2784,7 +2797,7 @@ TTS:%umin (calc)</translation>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation>%s %sP:%d %s</translation>
+        <translation>%s %sPres:%d %s</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts
index 1a47406c7..82d2ad273 100644
--- a/translations/subsurface_et_EE.ts
+++ b/translations/subsurface_et_EE.ts
@@ -75,57 +75,57 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation>Tüüp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation>Suurus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
         <translation>Töörõhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
         <translation>Algusrõhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
         <translation>Lõpurõhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation>O2%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation>Vaheta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Siin klikkamine eemaldab selle ballooni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation>Ballooni ei saa eemaldada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <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="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation>Mudel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation>Seadme ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation>Hüüdnimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <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="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
         <translation>kuupjalga/min</translation>
     </message>
@@ -194,87 +194,87 @@
         <translation>Näita otsinguakent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
         <translation>Nähtav:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation>laienda kõik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation>ahenda kõik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation>ahenda muud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <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="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
         <translation>loo uus väljasõit ülal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <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="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <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="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <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="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
         <translation>kustuta sukeldumine/sukeldumised</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
         <translation>salvesta nimega</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
         <translation>ekspordi UDDF kujul</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
         <translation>nihuta ajad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation>Salvesta sukeldumised nimega</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation>Salvesta fail nimega</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF failid (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation>ühenda valitud sukeldumised</translation>
     </message>
@@ -407,67 +407,67 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
         <translation>kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation>nael</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
         <translation>ülikond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
         <translation>ball</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
         <translation>asukoht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation>Hapnikumürgistuse ühik (OTU)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -488,7 +488,7 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation>Korduskatse</translation>
+        <translation>Korda</translation>
     </message>
 </context>
 <context>
@@ -540,16 +540,24 @@ palun eemalda need esmalt.</translation>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation>Toimeta valitud sukeldumiskohad</translation>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <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="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation>Asukoht</translation>
     </message>
@@ -586,215 +594,225 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Tags</source>
-        <translation>Lipikud</translation>
+        <translation>Sildid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation>Hinne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation>Nähtavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation>Ülikond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation>Märkmed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation>Varustus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation>Sukeldumise info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation>Kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation>Intervall</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
         <translation>Kasutatud gaasid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
         <translation>Tarbitud gaas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation>Max sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation>Keskm sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation>Hapnikumürgistuse ühik (OTU)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
         <translation>Õhurõhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation>Õhu temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation>Vee temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation>Sukeldumise aeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
         <translation>Soolsus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation>Statistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation>Koguaeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation>Sukeldumised</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Balloonid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Lisa balloon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Raskused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Lisa raskuste süsteem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation>Väljasõidu koht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation>Väljasõidu märkmed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation>Väljasõitu on toimetatud. Vali salvesta või loobu.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation>Salvesta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation>Loobu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <source>This trip is being edited.</source>
+        <translation>Seda väljasõitu toimetatakse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation>Mitmeid sukeldumisi on toimetatud. Vali salvesta või loobu.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <source>Multiple dives are being edited.</source>
+        <translation>Mitut sukeldumist toimetatakse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation>Sukeldumist on toimetatud. Vali salvesta või loobu.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <source>This dive is being edited.</source>
+        <translation>Seda sukeldumist toimetatakse.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -963,7 +981,7 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
-        <translation>&amp;Nummeerda ümber</translation>
+        <translation>&amp;Nummerda ümber</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
@@ -1167,7 +1185,7 @@ palun eemalda need esmalt.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation>Salvesta nimega</translation>
     </message>
@@ -1177,7 +1195,7 @@ palun eemalda need esmalt.</translation>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation>Hoiatus</translation>
     </message>
@@ -1187,7 +1205,7 @@ palun eemalda need esmalt.</translation>
         <translation>UDDF files (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1247,12 +1265,12 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="204"/>
         <source>Default Cylinder</source>
-        <translation>Vaikeballoon</translation>
+        <translation>Vaikimisi balloon</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="210"/>
         <source>Use Default Cylinder</source>
-        <translation>Kasuta vaikeballooni</translation>
+        <translation>Kasuta vaikimisi ballooni</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="246"/>
@@ -1357,7 +1375,7 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="443"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation>Laskumise/tõusu kiiruse nimetaja</translation>
+        <translation>Laskumise/Tõusu kiiruse kordaja</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="450"/>
@@ -1573,7 +1591,7 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
-        <translation>Tellimas</translation>
+        <translation>Tellimus</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="180"/>
@@ -1616,106 +1634,106 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
         <translation>Lisa gaasivahetus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
         <translation>Lisa järjehoidja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
         <translation>Eemalda sündmus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
         <translation>Peida sarnased sündmused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation>Peida sündmused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation>Peida kõik %1 sündmust?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation>Eemalda valitud sündmus?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation>tundmatu kompuuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation>Sea kestus: 10 minutit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation>Mõõtkava</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation>Joonlaud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation>Mõõda sukeldumise segmentide atribuute</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation>Skaleeri sukeldumine ekraani mõõtu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation>Toimeta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>õhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Üleminek avatud süsteemile</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> algus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> lõpp</translation>
@@ -1724,72 +1742,72 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
         <translation>Sukeldumine #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
         <translation>Max sügavus: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
         <translation>Kestus: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
         <translation>Kasutatud gaas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
         <translation>Max CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
         <translation>Raskused:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
         <translation>Märkmed:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
         <translation>Semu:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
         <translation>Ülikond:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
         <translation>Nähtavus:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
         <translation>Hinne:</translation>
     </message>
@@ -1807,16 +1825,11 @@ palun eemalda need esmalt.</translation>
         <translation>Eemalda see punkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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/globe.cpp" line="251"/>
-        <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation>Toimeta sukeldumist - 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>
@@ -1870,12 +1883,12 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="83"/>
         <source>earlier</source>
-        <translation>varem</translation>
+        <translation>varasem</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>later</source>
-        <translation>hiljem</translation>
+        <translation>hilisem</translation>
     </message>
 </context>
 <context>
@@ -1950,17 +1963,17 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation>Kirjeldus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1968,7 +1981,7 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Info</translation>
     </message>
@@ -1976,12 +1989,12 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation>Kirjeldus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2027,17 +2040,17 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation>Tüüp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation>Raskus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation>Siin klikkamine kõrvaldab selle raskuste süsteemi</translation>
     </message>
@@ -2045,79 +2058,79 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Aasta
  &gt; Kuu / väljasõit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation>Kestus
- kokku</translation>
+kokku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation>
 Keskmine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation>
 Lühim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation>
 Pikim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation>Sügavus (%1)
- keskmine</translation>
+keskmine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
         <translation>
 Miinimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
         <translation>
 Maksimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
  keskmine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -2827,12 +2840,12 @@ TTS:%umin (calc)</translation>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation>triiv</translation>
+        <translation>hoovus</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation>sügav</translation>
+        <translation>süva</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
@@ -2847,12 +2860,12 @@ TTS:%umin (calc)</translation>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation>vrakk</translation>
+        <translation>vraki</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation>koobas</translation>
+        <translation>koopa</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
@@ -2957,7 +2970,7 @@ TTS:%umin (calc)</translation>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation>Päike</translation>
+        <translation>Pühap</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts
index 06b18c1c9..2ef9a122b 100644
--- a/translations/subsurface_fi_FI.ts
+++ b/translations/subsurface_fi_FI.ts
@@ -75,57 +75,57 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation>Tyyppi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation>Tilavuus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
         <translation>Paineluokka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
         <translation>Alkupaine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
         <translation>Loppupaine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation>O2%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation>Vaihda syvyydessä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Poista säiliö.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation>Säiliötä ei voida poistaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <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="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation>Malli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation>Laite ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation>Lempinimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <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="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
         <translation>jalkaa/min</translation>
     </message>
@@ -194,87 +194,87 @@ poistaa valitun sukellustietokoneen?</translation>
         <translation>Näytä hakukenttä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
-        <translation type="unfinished"/>
+        <translation>Näkyvyys:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation>laajenna kaikki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation>supista kaikki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation>supista muut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>remove dive(s) from trip</source>
         <translation>erota sukellukset retkestä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
         <translation>luo uusi retki yläpuolelle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <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="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <source>merge trip with trip above</source>
         <translation>liitä retki yllä olevaan retkeen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <source>merge trip with trip below</source>
         <translation>liitä retki alla olevaan retkeen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
         <translation>poista sukellukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
         <translation>tallenna nimellä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
         <translation>vie UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
         <translation>muuta aikoja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation>Tallenna sukellukset nimellä...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation>Tallenna nimellä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF -tiedostot (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation>yhdistä valitut sukellukset</translation>
     </message>
@@ -407,67 +407,67 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
         <translation>päiväys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
         <translation>puku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
         <translation>säiliöt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
         <translation>kohde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation>Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation>Happikertymä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -540,16 +540,24 @@ poista ensin pysähdykset.</translation>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation>Muokkaa valittuja sukelluskohteita</translation>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <source>Dive Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation>Kohde</translation>
     </message>
@@ -589,212 +597,222 @@ poista ensin pysähdykset.</translation>
         <translation>Avainsanat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation>Yleisarvio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation>Näkyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation>Puku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation>Varusteet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation>Tiedot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation>Pinta-aika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
         <translation>Käytetyt kaasut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
         <translation>Kaasun kulutus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation>Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation>Maksimisyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation>Keskisyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation>Happikertymä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
         <translation>Ilmanpaine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation>Ilman lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation>Veden lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
         <translation>Suolapitoisuus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation>Tilastot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation>Kokonaiskesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation>Sukelluksia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Säiliöt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Lisää säiliö</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Painot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Lisää painojärjestelmä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation>Matkakohde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation>Matkan muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation>Tätä sukellusta muokataan. Lopeta valitsemalla Tallenna tai Peruuta.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation>Tallenna</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation>Peruuta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <source>This trip is being edited.</source>
+        <translation>Tätä sukellusretkeä muokataan.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation>Muokataan useita sukelluksia. Lopeta valitsemalla Tallenna tai Peruuta.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <source>Multiple dives are being edited.</source>
+        <translation>Muokataan useita sukelluksia.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation>Sukellusta muokataan. Lopeta valitsemalla Tallenna tai Peruuta.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <source>This dive is being edited.</source>
+        <translation>Tätä sukellusta muokataan.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -1167,7 +1185,7 @@ poista ensin pysähdykset.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation>Tallenna nimellä</translation>
     </message>
@@ -1177,7 +1195,7 @@ poista ensin pysähdykset.</translation>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation>Varoitus</translation>
     </message>
@@ -1187,7 +1205,7 @@ poista ensin pysähdykset.</translation>
         <translation>UDDF -tiedostot (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1616,106 +1634,106 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
         <translation>Lisää kaasun vaihto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
         <translation>Lisää kirjanmerkki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
         <translation>Poista tapahtuma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
         <translation>Piilota samankaltaiset tapahtumat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation>Piilota tapahtumat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation>Piilota kaikki %1 tapahtumat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation>Poistetaanko valitut tapahtumat?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation>tuntematon sukellustietokone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation>Aseta kesto: 10 minuuttia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation>Mittakaava</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation>Viivain</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation>Mittaa sukellusetappien ominaisuuksia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation>Laajenna profiili tilan mukaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation>Muuta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>ilma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Vaihto avoimeen ilman kiertoon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>alku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>loppu</translation>
@@ -1724,72 +1742,72 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
         <translation>Sukellus #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
         <translation>Suurin syvyys: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
         <translation>Kesto: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
         <translation>Kaasu:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
         <translation>Pintakulutus:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
         <translation>Max CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
         <translation>Painot:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
         <translation>Muistiinpanot:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
         <translation>Sukellusvanhin:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
         <translation>Sukelluspari:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
         <translation>Puku:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
         <translation>Näkyvyys:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
         <translation>Yleisarvio:</translation>
     </message>
@@ -1807,16 +1825,11 @@ poista ensin pysähdykset.</translation>
         <translation>Poista tämä etappi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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 sijaintitietoa - kaksoisnäpäytä sijaintia asettaaksesi sukelluskohteen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="251"/>
-        <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation>Sukelluksen muokkaus - kaksoisnäpäytä sijaintia asettaaksesi sukelluskohteen</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Sulje</translation>
@@ -1950,17 +1963,17 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation>Kuvaus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1968,7 +1981,7 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Tiedot</translation>
     </message>
@@ -1976,12 +1989,12 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation>Kuvaus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2027,17 +2040,17 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation>Tyyppi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation>Painot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation>Poista painojärjestelmä näpäyttämällä ikonia.</translation>
     </message>
@@ -2045,79 +2058,79 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Vuosi
 &gt; Kuukausi / Retki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation>Kesto
 Kokonais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation>
 Keskim.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation>
 Lyhin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation>
 Pisin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation>Dyvyys (%1)
 Keski</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
         <translation>
 Alin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
         <translation>
 Suurin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Keski</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Lämpö (%1)
diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts
index 6bc314ce4..bb19eb4c2 100644
--- a/translations/subsurface_fr_FR.ts
+++ b/translations/subsurface_fr_FR.ts
@@ -75,57 +75,57 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
         <translation>Press. Service</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
         <translation>Press. Début</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
         <translation>Press. Fin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation>O2%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation>Changement à</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Cliquer ici retirera ce bloc.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation>Le bloc ne peut être retiré.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <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="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation>Modèle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation>Identifiant du périphérique</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation>Surnom</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <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="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
         <translation> cuft/min</translation>
     </message>
@@ -194,87 +194,87 @@ 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="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
         <translation>Visible:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation>tout déplier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation>tout replier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation>replier les autres</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>remove dive(s) from trip</source>
         <translation>retirer plongée(s) du groupe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
         <translation>créer un nouveau groupe au-dessus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <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="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <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="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <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="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
         <translation>supprimer plongée(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
         <translation>Enregistrer sous</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
         <translation>Exporter comme un fichier UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
         <translation>décaler l&apos;heure</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation>Enregistrer les plongées sous...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation>Enregistrer le fichier sous</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Fichiers UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation>fusionner les plongées sélectionnées</translation>
     </message>
@@ -407,67 +407,67 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation>N°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
         <translation>date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation>pied</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
         <translation>combinaison</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
         <translation>blk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
         <translation>lieu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation>Consommation d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation>SNCmax</translation>
     </message>
@@ -540,16 +540,24 @@ Veuillez d&apos;abord les supprimer.</translation>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation>Modifier le lieu de la plongée sélectionnée</translation>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <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="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
@@ -589,212 +597,222 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Étiquettes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation>Évaluation</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation>Visibilité</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation>Combinaison</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation>Équipement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation>Détails de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation>Intervalle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
         <translation>Gaz utilisés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
         <translation>Gaz consommé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation>Consommation d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation>Profondeur max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation>Profondeur moy.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
         <translation>Pression d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation>Température air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation>Température eau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation>Temps de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
         <translation>Salinité</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation>Stats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation>Température</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation>Temps total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation>Plongées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Blocs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Ajouter un bloc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Ajouter un système de poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation>Lieu du groupe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation>Notes du groupe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation>Ce groupe est en train d&apos;être édité. Sélectionnez Enregistrer ou Annuler quand vous avez fini.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation>Sauvegarder</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <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="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation>Plusieurs plongées sont en train d&apos;être éditées. Sélectionnez Enregistrer ou Annuler quand vous avez fini.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <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="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation>Cette plongée est en train d&apos;être éditée. Sélectionnez Enregistrer ou Annuler quand vous avez fini.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <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="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation>O</translation>
     </message>
@@ -1167,7 +1185,7 @@ Veuillez d&apos;abord les supprimer.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation>Enregistrer le fichier sous</translation>
     </message>
@@ -1177,7 +1195,7 @@ Veuillez d&apos;abord les supprimer.</translation>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
@@ -1187,7 +1205,7 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Fichiers UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1616,106 +1634,106 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
         <translation>Ajouter un changement de mélange</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
         <translation>Ajouter un signet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
         <translation>Supprimer l&apos;événement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
         <translation>Cacher les événements similaires</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation>Cacher les événements</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation>Cacher tous les événements %1 ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation>Supprimer l&apos;événement sélectionné ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation>ordinateur inconnu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation>Réglez la durée : 10 minutes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation>Échelle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation>Règle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation>Mesure des propriétés d&apos;une partie de la plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation>Ajuster la plongée à la taille de l&apos;écran</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Passer en CO</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> début</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> fin</translation>
@@ -1724,72 +1742,72 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
         <translation>Plongée #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
         <translation>Profondeur max: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
         <translation>Durée: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
         <translation>Gaz utilisé:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
         <translation>Consommation d&apos;air:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
         <translation>SNC Max.:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
         <translation>Poids:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
         <translation>Notes:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
         <translation>Chef de palanquée:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
         <translation>Binôme:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
         <translation>Combinaison:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
         <translation>Visi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
         <translation>Évaluation:</translation>
     </message>
@@ -1807,16 +1825,11 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Supprimer ce point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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>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/globe.cpp" line="251"/>
-        <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation>Édition de la plongée - 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>
@@ -1950,17 +1963,17 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1968,7 +1981,7 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
@@ -1976,12 +1989,12 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2027,17 +2040,17 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation>Poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation>Cliquer ici retirera ce système de poids.</translation>
     </message>
@@ -2045,79 +2058,79 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Année
 &gt; Mois / Groupe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation>N°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation>Durée
 Totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation>
 Moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation>
 Plus courte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation>
 Plus longue</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation>Pronfondeur (%&amp;)
 Moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts
index 9f6f00648..3f3350f3d 100644
--- a/translations/subsurface_hr_HR.ts
+++ b/translations/subsurface_hr_HR.ts
@@ -75,57 +75,57 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation>Vrsta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation>Veličina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <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="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation>Naziv uređaja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <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="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
         <translation type="unfinished"/>
     </message>
@@ -193,87 +193,87 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <source>merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <source>merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation type="unfinished"/>
     </message>
@@ -405,67 +405,67 @@ Please, remove them first.</source>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation>Br.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -538,16 +538,24 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <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="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
@@ -587,212 +595,222 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation>Ocjena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation>Vidljivost</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation>Odijelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation>Bilješke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation>Oprema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation>Informacije o uronu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation>Statistike</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation>Ukupno trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation>Uroni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Boce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -1165,7 +1183,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </message>
@@ -1175,7 +1193,7 @@ Please, remove them first.</source>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
@@ -1185,7 +1203,7 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
@@ -1614,106 +1632,106 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>zrak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Neplanirani prelazak na OC sustav</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> započni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> završi</translation>
@@ -1722,72 +1740,72 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -1805,16 +1823,11 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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/globe.cpp" line="251"/>
-        <source>Editing dive - 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>
@@ -1948,17 +1961,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1966,7 +1979,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -1974,12 +1987,12 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2025,17 +2038,17 @@ Please, remove them first.</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation>Vrsta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation>Težina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation type="unfinished"/>
     </message>
@@ -2043,70 +2056,70 @@ Please, remove them first.</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation>Br.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"/>
diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts
index 7f9a7dd06..b28ca7b37 100644
--- a/translations/subsurface_it_IT.ts
+++ b/translations/subsurface_it_IT.ts
@@ -4,7 +4,7 @@
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"/>
+        <translation>Importa file (CSV)</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
@@ -19,12 +19,12 @@
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="197"/>
         <source>Field Separator</source>
-        <translation type="unfinished"/>
+        <translation>Separatore di campo</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"/>
+        <translation>Configurazione Campo</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
@@ -49,7 +49,7 @@
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="146"/>
         <source>Cns</source>
-        <translation type="unfinished"/>
+        <translation>CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="163"/>
@@ -59,75 +59,75 @@
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="215"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"/>
+        <translation>Importazioni preconfigurate</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"/>
+        <translation>Apri File di Log CSV</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"/>
+        <translation>Files CSV (*.csv)</translation>
     </message>
 </context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation>O2%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <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="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation>La bombola non può essere rimossa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"/>
+        <translation>Questo gas è in uso. Solo le bombole che non sono usate nell&apos;immersione possono essere rimosse.</translation>
     </message>
 </context>
 <context>
@@ -153,22 +153,22 @@ il computer seleizonato?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation>Modello</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation>ID della periferica</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation>Nickname</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation>Facendo click qui si rimuove questo computer.</translation>
     </message>
@@ -176,14 +176,14 @@ il computer seleizonato?</translation>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
-        <translation type="unfinished"/>
+        <translation>piedi cubi/min</translation>
     </message>
 </context>
 <context>
@@ -194,87 +194,87 @@ il computer seleizonato?</translation>
         <translation>Mostra la finestra di ricerca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
         <translation>Visibilità:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation>espandi tutto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation>collassa tutte le voci</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"/>
+        <translation>rimuovi l&apos;immersione(i) dal viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
-        <translation type="unfinished"/>
+        <translation>crea un nuovo viaggio sopra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <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="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"/>
+        <translation>unisci il viaggio con il viaggio sopra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"/>
+        <translation>unisci il viaggio con il viaggio sotto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
         <translation>cancella immersione(i)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
         <translation>Salva come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
         <translation>Esporta come UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation>Salva immersioni come ...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation>Salva come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>File UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation>unisci le immersioni selezionate</translation>
     </message>
@@ -284,22 +284,22 @@ il computer seleizonato?</translation>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"/>
+        <translation>CAS sul fondo</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"/>
+        <translation>CAS nella tappa di decompressione</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
-        <translation type="unfinished"/>
+        <translation>GFHigh</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
-        <translation type="unfinished"/>
+        <translation>GFLow</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="105"/>
@@ -338,7 +338,7 @@ il computer seleizonato?</translation>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"/>
+        <translation>Gestore dell&apos;errore di posizione</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
@@ -368,12 +368,12 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1082"/>
         <source>Used Gas</source>
-        <translation type="unfinished"/>
+        <translation>Gas usato</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1083"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"/>
+        <translation>CC Set Point</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1278"/>
@@ -391,7 +391,7 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="944"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"/>
+        <translation>Punti del Dive Planner</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="947"/>
@@ -407,67 +407,67 @@ Per favore, rimuovile prima.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
         <translation>muta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
         <translation>Luogo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation>max CNS</translation>
     </message>
@@ -540,16 +540,24 @@ Per favore, rimuovile prima.</translation>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation>Modifica le località d&apos;immersione selezionate</translation>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <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="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation>Luogo</translation>
     </message>
@@ -586,215 +594,225 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Tags</source>
-        <translation type="unfinished"/>
+        <translation>Tags</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation>Valutazione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation>Visibilità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation>Muta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation>Attrezzatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation>Informazioni sull&apos;immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation>Intervallo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
         <translation>Gas usati</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
         <translation>Gas consumato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation>Profondità max</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation>Profondità media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
         <translation>Pressione aria</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation>Temperatura aria</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation>Temperatura dell&apos;acqua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation>Tempo d&apos;Immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
-        <translation type="unfinished"/>
+        <translation>Salinità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation>Statistiche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation>Tempo Totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation>Immersioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Bombole</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Aggiungi bombola</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Pesi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Aggiungi un tipo di pesi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation>Luogo del viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation>Note di viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation>Salva</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation>Annulla</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <source>This trip is being edited.</source>
+        <translation>Questo viaggio è stato editato.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation>Sono state modificate diverse immersioni. Seleziona Salva o Annulla quando fatto.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <source>Multiple dives are being edited.</source>
+        <translation>Si stanno modificando immersioni multiple.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation>Questa immersione è stata modificata. Seleziona Salva o Annulla quando fatto.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <source>This dive is being edited.</source>
+        <translation>Si sta modificando questa immersione </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -1013,7 +1031,7 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
-        <translation type="unfinished"/>
+        <translation>Globo</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="480"/>
@@ -1068,7 +1086,7 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
-        <translation type="unfinished"/>
+        <translation>Raggruppamento Automatico</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
@@ -1167,7 +1185,7 @@ Per favore, rimuovile prima.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation>Salva come</translation>
     </message>
@@ -1177,7 +1195,7 @@ Per favore, rimuovile prima.</translation>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation>Avviso</translation>
     </message>
@@ -1187,7 +1205,7 @@ Per favore, rimuovile prima.</translation>
         <translation>File UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>File XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1352,12 +1370,12 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="437"/>
         <source>Time units</source>
-        <translation type="unfinished"/>
+        <translation>Unità di Tempo</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="443"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"/>
+        <translation>Denominatore della Risalita/Discesa </translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="450"/>
@@ -1399,17 +1417,17 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="623"/>
         <source>MOD</source>
-        <translation type="unfinished"/>
+        <translation>MOD</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="662"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"/>
+        <translation>EAD END EADD</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="671"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"/>
+        <translation>Ceiling riportato dal computer</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="694"/>
@@ -1419,7 +1437,7 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="705"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"/>
+        <translation>Ceiling calcolato</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="728"/>
@@ -1434,17 +1452,17 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"/>
+        <translation>Calcola NDL/TTS</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="797"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"/>
+        <translation>GFLow alla massima profondità</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="771"/>
         <source>Misc</source>
-        <translation type="unfinished"/>
+        <translation>Varie</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
@@ -1464,12 +1482,12 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="777"/>
         <source>GFLow</source>
-        <translation type="unfinished"/>
+        <translation>GFLow</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFHigh</source>
-        <translation type="unfinished"/>
+        <translation>GFHigh</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="187"/>
@@ -1616,106 +1634,106 @@ Per favore, rimuovile prima.</translation>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
         <translation>Aggiungi una miscela</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
         <translation>Aggiungi un segnalibro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
         <translation>Rimuovi evento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
         <translation>Nascondi eventi simili</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation>Nascondi eventi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation>Nascondo tutti i %1 eventi?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation>Rimuovo l&apos;evento selezionato?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation>Computer sconosciuto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation>Setta la durata: 10 minuti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation>Scala</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation>Righello</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation>Riscala l&apos;immersione per l&apos;ampiezza dello schermo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>aria</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation>EAN1%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Bailing out in circuito aperto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>inizio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>fine</translation>
@@ -1724,72 +1742,72 @@ Per favore, rimuovile prima.</translation>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
         <translation>Immersione #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
         <translation>Massima profondità: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
         <translation>Durata: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
         <translation>Miscela usata:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
-        <translation type="unfinished"/>
+        <translation>CAS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
-        <translation type="unfinished"/>
+        <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
         <translation>Pesi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
         <translation>Note:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
         <translation>Compagno:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
         <translation>Muta:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
         <translation>Valutazione:</translation>
     </message>
@@ -1804,19 +1822,14 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"/>
+        <translation>Rimuovi questo punto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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/globe.cpp" line="251"/>
-        <source>Editing dive - 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>Chiudi</translation>
@@ -1870,12 +1883,12 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="83"/>
         <source>earlier</source>
-        <translation type="unfinished"/>
+        <translation>prima</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>later</source>
-        <translation type="unfinished"/>
+        <translation>dopo</translation>
     </message>
 </context>
 <context>
@@ -1911,7 +1924,7 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>Wait a bit until we have something...</source>
-        <translation type="unfinished"/>
+        <translation>Aspetta un attimo abbiamo qualcosa...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
@@ -1950,17 +1963,17 @@ Per favore, rimuovile prima.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1968,7 +1981,7 @@ Per favore, rimuovile prima.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Informazione</translation>
     </message>
@@ -1976,12 +1989,12 @@ Per favore, rimuovile prima.</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2001,7 +2014,7 @@ Per favore, rimuovile prima.</translation>
     <message>
         <location filename="../qt-ui/webservices.ui" line="32"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"/>
+        <translation>Inserisci il tuo ID qui</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="39"/>
@@ -2027,17 +2040,17 @@ Per favore, rimuovile prima.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation>Facendo click qui si rimuove il sistema di pesi.</translation>
     </message>
@@ -2045,79 +2058,79 @@ Per favore, rimuovile prima.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Anno 
 &gt; Mese / Viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation>Durata 
 Totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation>
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation>
 Più corta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation>
 Più lunga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation>Profondità (%1)
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
         <translation>
 Minimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
         <translation>
 Massimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -2237,13 +2250,13 @@ Media</translation>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"/>
+        <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"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"/>
+        <translation>Il numero massimo di colonne supportate nel file CSV è di %d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
@@ -2335,7 +2348,7 @@ Media</translation>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
-        <translation type="unfinished"/>
+        <translation>sotto il piano</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
@@ -2425,7 +2438,7 @@ Media</translation>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"/>
+        <translation>Errore nell&apos;ottenere la pressione superficiale</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
@@ -2718,19 +2731,22 @@ Deco:%umin @ %.0f %s (calc)</source>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"/>
+        <translation>%s
+In decompressione (calc)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"/>
+        <translation>%s
+NDL:%umin (calc)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"/>
+        <translation>%s
+TTS:%umin (calc)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
@@ -2769,12 +2785,12 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"/>
+        <translation>C</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"/>
+        <translation>F</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
@@ -2866,7 +2882,7 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"/>
+        <translation>acqua dolce</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts
index 741017dec..062191c64 100644
--- a/translations/subsurface_nb_NO.ts
+++ b/translations/subsurface_nb_NO.ts
@@ -75,57 +75,57 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
         <translation>Makstrykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
         <translation>Starttrykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
         <translation>Sluttrykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation>O₂%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation>Gassbytte ved</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <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="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flaska kan ikke fjernes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <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="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation>Enhets-ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <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="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
         <translation>ft³/min</translation>
     </message>
@@ -193,87 +193,87 @@
         <translation>Vis søkeboks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
         <translation>Synlig:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation>vis alle turer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation>slå sammen alle turer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation>slå sammen andre turer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>remove dive(s) from trip</source>
         <translation>fjern dykk fra tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
         <translation>legg til ny tur over denne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <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="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <source>merge trip with trip above</source>
         <translation>slå sammen tur med turen over</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <source>merge trip with trip below</source>
         <translation>slå sammen tur med turen under</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
         <translation>slett dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
         <translation>lagre som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
         <translation>eksporter som UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
         <translation>forskyvning av tidspunkter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation>Lagre dykk som...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation>Lagre som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF-filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation>slå sammen valgte dykk</translation>
     </message>
@@ -406,67 +406,67 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
         <translation>dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
         <translation>drakt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
         <translation>flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
         <translation>sted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation>maks CNS</translation>
     </message>
@@ -539,16 +539,24 @@ Fjern dem før du gjør dette.</translation>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <source>Dive Notes</source>
         <translation>Dykk</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
@@ -588,212 +596,222 @@ Fjern dem før du gjør dette.</translation>
         <translation>Emner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation>Vurdering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation>Sikt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation>Drakt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation>Notater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation>Utstyr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation>Informasjon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation>Intervall</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
         <translation>Gasser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
         <translation>Gasskonsum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation>Maksdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation>Snittdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
         <translation>Lufttrykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation>Vanntemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation>Dykketid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
         <translation>Saltholdighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation>Statistikk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation>Dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Flasker</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Legg til flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Vekter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Legg til vektsystem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation>Tursted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation>Turnotater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation>Denne turen redigeres. Velg Lagre eller Avbryt når du er ferdig.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation>Lagre</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <source>This trip is being edited.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation>Flere dykk redigeres. Velg Lagre eller Avbryt når du er ferdig.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <source>Multiple dives are being edited.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation>Dykket redigeres. Velg Lagre eller Avbryt når du er ferdig.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <source>This dive is being edited.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation>V</translation>
     </message>
@@ -1166,7 +1184,7 @@ Fjern dem før du gjør dette.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation>Lagre som</translation>
     </message>
@@ -1176,7 +1194,7 @@ Fjern dem før du gjør dette.</translation>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
@@ -1186,7 +1204,7 @@ Fjern dem før du gjør dette.</translation>
         <translation>UDDF-filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1615,106 +1633,106 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
         <translation>Legg til gassbytte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
         <translation>Legg til bokmerke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
         <translation>Fjern hendelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
         <translation>Skjul lignende hendelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation>Skjul hendelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation>Skjul alle %1 hendelser?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation>Fjern den valgte hendelsen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation>ukjent dykkecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation>Varighet: 10 minutter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation>Målestokk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation>Linjal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation>Mål egenskaper ved dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation>Skaler dykket til skjermstørrelsen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Bytter til OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> start</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> slutt</translation>
@@ -1723,72 +1741,72 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
         <translation>Dykk nr. %1- %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
         <translation>Max dybde: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
         <translation>Varighet: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
         <translation>Gass brukt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
         <translation>Mac. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
         <translation>Vekter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
         <translation>Notater:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
         <translation>Dykkeleder:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
         <translation>Drakt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
         <translation>Sikt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
         <translation>Vurdering:</translation>
     </message>
@@ -1806,16 +1824,11 @@ Fjern dem før du gjør dette.</translation>
         <translation>Fjern dette punktet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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>Ingen stedsdata - finn sted i kartet og dobbelklikk for å sette posisjon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="251"/>
-        <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation>Redigerer dykk - finn sted i kartet og dobbeltklikk for å sette posisjon</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Lukk</translation>
@@ -1949,17 +1962,17 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1967,7 +1980,7 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Informasjon</translation>
     </message>
@@ -1975,12 +1988,12 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2026,17 +2039,17 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation>Vekt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation>Klikk her for å fjerne dette vektsystemet</translation>
     </message>
@@ -2044,79 +2057,79 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>År
 &gt; Måned / Tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation>Varighet
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation>
 Snitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation>
 Kortest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation>
 Lengst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation>Dybde (%1)
 Snitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
         <translation>
 Maksimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Snitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts
index d4c18482e..01ec78398 100644
--- a/translations/subsurface_nl_NL.ts
+++ b/translations/subsurface_nl_NL.ts
@@ -75,57 +75,57 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
         <translation>Werkdruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
         <translation>Startdruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
         <translation>Einddruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation>O2%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation>Wissel op</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <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="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation>Fles kan niet verwijderd worden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <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="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation>Toestel ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation>Apparaatnaam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <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="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
         <translation>cuft/min</translation>
     </message>
@@ -194,87 +194,87 @@ duikcomputer wilt verwijderen?</translation>
         <translation>Zoekvak Tonen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
         <translation>Zichtbaar:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation>alles uitklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation>alles inklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation>andere samenklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>remove dive(s) from trip</source>
         <translation>duik(en) uit trip verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
         <translation>nieuwe duik aanmaken hierboven</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <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="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <source>merge trip with trip above</source>
         <translation>trip samenvoegen met trip hierboven</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <source>merge trip with trip below</source>
         <translation>trip samenvoegen met trip hieronder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
         <translation>duik(en) verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
         <translation>bewaren Als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
         <translation>Als UDDF exporteren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
         <translation>tijdstippen verschuiven</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation>Duiken Bewaren Als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation>Bestand Bewaren als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF bestanden (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation>geselecteerde duiken samenvoegen</translation>
     </message>
@@ -407,67 +407,67 @@ Verwijder deze eerst.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
         <translation>datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
         <translation>duikpak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
         <translation>fles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
         <translation>locatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation>max. CNS</translation>
     </message>
@@ -540,16 +540,24 @@ Verwijder deze eerst.</translation>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <source>Dive Notes</source>
         <translation>Duiknotities</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
@@ -589,212 +597,222 @@ Verwijder deze eerst.</translation>
         <translation>Trefwoorden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation>Waardering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation>Zicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation>Pak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation>Notities</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation>Uitrusting</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation>Duikinformatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation>Interval</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
         <translation>Gebruikte gassen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
         <translation>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation>Max. Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation>Gem. Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
         <translation>Luchtdruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation>Luchttemperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation>Watertemperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation>Duiktijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
         <translation>Zoutgehalte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation>Statistieken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation>Totale tijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation>Duiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Flessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Fles toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Gewichten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Gewichtssysteem toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation>Trip locatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation>Trip Nota&apos;s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation>Deze trip wordt bewerkt. Kies Bewaren of Ongedaan maken als u klaar bent.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation>Opslaan</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <source>This trip is being edited.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation>Meerdere duiken worden bewerkt. Kies Bewaren of Ongedaan maken als u klaar bent.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <source>Multiple dives are being edited.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation>Deze duik wordt bewerkt. Kies Bewaren of Ongedaan maken als u klaar bent.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <source>This dive is being edited.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation>Z</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -1167,7 +1185,7 @@ Verwijder deze eerst.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation>Bestand Bewaren als</translation>
     </message>
@@ -1177,7 +1195,7 @@ Verwijder deze eerst.</translation>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
@@ -1187,7 +1205,7 @@ Verwijder deze eerst.</translation>
         <translation>UDDF bestanden (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1616,106 +1634,106 @@ Verwijder deze eerst.</translation>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
         <translation>Gaswissel toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
         <translation>Bladwijzer toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
         <translation>Gebeurtenis verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
         <translation>Gelijkaardige gebeurtenissen verbergen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation>Gebeurtenissen verbergen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation>Alle %1 gebeurtenissen verbergen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation>Geselecteerde gebeurtenis verwijderen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation>onbekende duikcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation>Duur instellen: 10 minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation>Schaal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation>Meetlat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation>Eigenschappen van duiksegmenten berekenen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation>Duik aan schermgrootte aanpassen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation>Bewerken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>lucht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Schakel om naar OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> begin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> eind</translation>
@@ -1724,72 +1742,72 @@ Verwijder deze eerst.</translation>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
         <translation>Duik #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
         <translation>Max diepte: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
         <translation>Duur: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
         <translation>Verbruikt gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
         <translation>Gasverbruik:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
         <translation>Gewichten:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
         <translation>Nota&apos;s:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
         <translation>Duikpak:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
         <translation>Zichtbaarheid:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
         <translation>Beoordeling:</translation>
     </message>
@@ -1807,16 +1825,11 @@ Verwijder deze eerst.</translation>
         <translation>Dit punt verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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/globe.cpp" line="251"/>
-        <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation>Duik bewerken - verplaats de kaart en dubbelklik om de duiklocatie te selecteren</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Sluiten</translation>
@@ -1950,17 +1963,17 @@ Verwijder deze eerst.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation>Beschrijving</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1968,7 +1981,7 @@ Verwijder deze eerst.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Informatie</translation>
     </message>
@@ -1976,12 +1989,12 @@ Verwijder deze eerst.</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation>Beschrijving</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2027,17 +2040,17 @@ Verwijder deze eerst.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation>Hier klikken om het gewichtssysteem te verwijderen</translation>
     </message>
@@ -2045,79 +2058,79 @@ Verwijder deze eerst.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Jaar
  &gt; Maand / Trip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation>Duur
  Totaal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation>
 Gemiddeld</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation>
 Kortste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation>
 Langste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation>Diepte (%1)
  Gemiddeld</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation>Gasverbruik (%1)
  Gemiddeld</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts
index 06673c0a7..5cb030567 100644
--- a/translations/subsurface_pl_PL.ts
+++ b/translations/subsurface_pl_PL.ts
@@ -75,57 +75,57 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation>Rodzaj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation>Pojemność</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
         <translation>Ciśnienie robocze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
         <translation>Ciśnienie początkowe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
         <translation>Ciśnienie końcowe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation>O2%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation>Zmiana na</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <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="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation>Butla nie może być usunięta.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <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="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation>ID urządzenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <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="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation> l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
         <translation> cuft/min</translation>
     </message>
@@ -194,87 +194,87 @@ wybrany komputer nurkowy?</translation>
         <translation>Pokaż okno wyszukiwania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
         <translation>Widoczne:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation>rozwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation>zwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation>zwiń pozostałe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>remove dive(s) from trip</source>
         <translation>usuń nurkowanie(a) z grupy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
         <translation>utwórz nową grupę powyżej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <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="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <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="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <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="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
         <translation>usuń nurkowanie(a)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
         <translation>zapisz jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
         <translation>eksportuj jako plik UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
         <translation>zmień czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation>Zapisz nurkowania jako...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation>Zapisz plik jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Pliki UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation>połącz wybrane nurkowania</translation>
     </message>
@@ -407,67 +407,67 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
         <translation>skafander</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
         <translation>butla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
         <translation>miejsce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -540,16 +540,24 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <source>Dive Notes</source>
         <translation>Notatki</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
@@ -589,212 +597,222 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Tagi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation>Ocena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation>Widoczność</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation>Skafander</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation>Notatki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation>Wyposażenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation>Informacje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation>Przerwa powierzchniowa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
         <translation>Dostępne gazy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
         <translation>Zużyty gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation>Max głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation>Średnia głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
         <translation>Ciśnienie atmosferyczne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation>Temperatura powietrza</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation>Temperatura wody</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation>Czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
         <translation>Zasolenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation>Statystyka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation>Całkowity czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation>Nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Butle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Dodaj butlę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Dodaj balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation>Miejsce nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation>Opis nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation>Ta grupa jest edytowana. Wybierz Zapisz lub Anuluj gdy skończysz. </translation>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation>Zapisz</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation>Anuluj</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <source>This trip is being edited.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation>Kilka nurkowań jest edytowanych. Wybierz Zapisz lub Anuluj gdy skończysz. </translation>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <source>Multiple dives are being edited.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation>To nurkowanie jest edytowane. Wybierz Zapisz lub Anuluj gdy skończysz. </translation>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <source>This dive is being edited.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -1167,7 +1185,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation>Zapisz plik jako</translation>
     </message>
@@ -1177,7 +1195,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
@@ -1187,7 +1205,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Pliki UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Pliki Subsurface XML  (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1616,106 +1634,106 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
         <translation>Dodaj zmianę gazu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
         <translation>Dodaj notatkę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
         <translation>Usuń znacznik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
         <translation>Ukryj podobne znaczniki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation>Ukryj znaczniki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation>Ukryć %1 znaczniki?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation>Usunąc wybrane znaczniki?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation>nieznany komputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation>Ustaw czas trwania: 10 minut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation>Skala</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation>Linijka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation>Pomiar parametrów fragmentu nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation>Skalowanie profilu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>powietrze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Przejście na obieg otwarty</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> początek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> koniec</translation>
@@ -1724,72 +1742,72 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
         <translation>Nurkownie #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
         <translation>Max głębokość: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
         <translation>Czas: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
         <translation>Użyty gaz:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
         <translation>Max CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
         <translation>Balast:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
         <translation>Opis:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
         <translation>Partner:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
         <translation>Skafander:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
         <translation>Widzialność:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
         <translation>Ocena:</translation>
     </message>
@@ -1807,16 +1825,11 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Usuń ten punkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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/globe.cpp" line="251"/>
-        <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation>Edycja nurkowania - przesuń mapę i dwukliknij na niej by dodać miejsce. </translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Zamknij</translation>
@@ -1950,17 +1963,17 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1968,7 +1981,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Informacja</translation>
     </message>
@@ -1976,12 +1989,12 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2027,17 +2040,17 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation>Rodzaj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation>Kliknięcie tu usunie ten balast z listy.</translation>
     </message>
@@ -2045,74 +2058,74 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Rok 
  &gt; Miesiąc / grupa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation>Czas trwania
 całkowity</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation>średni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation>najkrótszy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation>najdłuższy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation>Głębokość (%1)
  średnia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
         <translation>minimalna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
         <translation>maksymalna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
  średni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temperatura (%1)
diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts
index fa53d2d2f..06769e80c 100644
--- a/translations/subsurface_pt_BR.ts
+++ b/translations/subsurface_pt_BR.ts
@@ -34,7 +34,7 @@
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
         <source>Time</source>
-        <translation type="unfinished"/>
+        <translation>Tempo</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
@@ -44,7 +44,7 @@
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="112"/>
         <source>Temp</source>
-        <translation type="unfinished"/>
+        <translation>Temp</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="146"/>
@@ -64,68 +64,68 @@
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"/>
+        <translation>Abrir arquivo CSV Log</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"/>
+        <translation>Arquivo CSV (*.csv)</translation>
     </message>
 </context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
         <translation>Pressão inicial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
         <translation>Pressão final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation>O2%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <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="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation>Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation>Apelido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <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="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
         <translation type="unfinished"/>
     </message>
@@ -193,87 +193,87 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation>expandir todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <source>merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <source>merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
-        <translation type="unfinished"/>
+        <translation>salvar como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation>Salvar aquivo como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation>mesclar mergulhos selecionados</translation>
     </message>
@@ -304,7 +304,7 @@
         <location filename="../qt-ui/diveplanner.ui" line="105"/>
         <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
-        <translation type="unfinished"/>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="128"/>
@@ -405,67 +405,67 @@ Please, remove them first.</source>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
-        <translation type="unfinished"/>
+        <translation>data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
-        <translation type="unfinished"/>
+        <translation>local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation type="unfinished"/>
     </message>
@@ -538,16 +538,24 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <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="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
@@ -574,12 +582,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <source>Air temp</source>
-        <translation type="unfinished"/>
+        <translation>Temp do Ar</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <source>Water temp</source>
-        <translation type="unfinished"/>
+        <translation>Temp da água</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="127"/>
@@ -587,212 +595,222 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation>Visibilidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation>Roupa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation>Equipamento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation>Info do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation>Intervalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
-        <translation type="unfinished"/>
+        <translation>Gás utilizado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"/>
+        <translation>Gás consumido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation>Profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation>Profundidade Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"/>
+        <translation>Pressão do Ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation>Temperatura do Ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation>Temperatura da água</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation>Tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
         <translation>Salinidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation>Tempo total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation>Mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Cilindros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation>Salvar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation>L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation>O</translation>
     </message>
@@ -916,7 +934,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="319"/>
@@ -926,7 +944,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+,</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="335"/>
@@ -946,7 +964,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="359"/>
@@ -956,7 +974,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl++</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="372"/>
@@ -966,7 +984,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="388"/>
@@ -981,7 +999,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="401"/>
@@ -1001,7 +1019,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
-        <translation type="unfinished"/>
+        <translation>Tudo</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="464"/>
@@ -1021,12 +1039,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
-        <translation type="unfinished"/>
+        <translation>Importar CSV</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
@@ -1036,7 +1054,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"/>
+        <translation>Importar de Divelogs.de</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
@@ -1141,7 +1159,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"/>
+        <translation>Não foi possível encontrar o manual do Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
@@ -1165,7 +1183,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation>Salvar aquivo como</translation>
     </message>
@@ -1175,7 +1193,7 @@ Please, remove them first.</source>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
@@ -1185,7 +1203,7 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
@@ -1210,7 +1228,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="131"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"/>
+        <translation>Listas e tabelas</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="137"/>
@@ -1452,7 +1470,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="646"/>
         <source>max PPO2</source>
-        <translation type="unfinished"/>
+        <translation>max PPO2</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="759"/>
@@ -1614,106 +1632,106 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation>Ocultar eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation>computador de mergulho desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation>Escala</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
-        <translation type="unfinished"/>
+        <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>início</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>fim</translation>
@@ -1722,72 +1740,72 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"/>
+        <translation>Mergulho #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"/>
+        <translation>Profundidade máxima: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"/>
+        <translation>Duração: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -1805,16 +1823,11 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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/globe.cpp" line="251"/>
-        <source>Editing dive - 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>Fechar</translation>
@@ -1863,7 +1876,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="73"/>
         <source>h:mm</source>
-        <translation type="unfinished"/>
+        <translation>h:mm</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="83"/>
@@ -1948,17 +1961,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1966,7 +1979,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
@@ -1974,12 +1987,12 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2025,17 +2038,17 @@ Please, remove them first.</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation type="unfinished"/>
     </message>
@@ -2043,73 +2056,76 @@ Please, remove them first.</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"/>
+        <translation>
+Mínimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"/>
+        <translation>
+Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"/>
+        <translation>Temp. (%1)
+ Média</translation>
     </message>
 </context>
 <context>
@@ -2286,7 +2302,7 @@ Maximum</source>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished"/>
+        <translation>parada de segurança</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
@@ -2317,7 +2333,7 @@ Maximum</source>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished"/>
+        <translation>duração do mergulho</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
@@ -2504,7 +2520,7 @@ Maximum</source>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="360"/>
         <source>EAN%d</source>
-        <translation type="unfinished"/>
+        <translation>EAN%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
@@ -2545,7 +2561,8 @@ baseado em GFlow = %.0f e GFhigh = %.0f
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished"/>
+        <translation>Mudar para a mistura %s
+</translation>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
@@ -2563,7 +2580,7 @@ baseado em GFlow = %.0f e GFhigh = %.0f
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished"/>
+        <translation>ean</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
@@ -2716,7 +2733,7 @@ TTS:%umin (calc)</source>
         <location filename="../profile.c" line="1413"/>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
@@ -2743,12 +2760,12 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"/>
+        <translation>C</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"/>
+        <translation>F</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
@@ -2784,7 +2801,7 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished"/>
+        <translation>drift</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
@@ -2804,12 +2821,12 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished"/>
+        <translation>naufrágio</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished"/>
+        <translation>caverna</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
@@ -2869,7 +2886,7 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
-        <translation type="unfinished"/>
+        <translation>mais que %d dias</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="220"/>
@@ -2914,52 +2931,52 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished"/>
+        <translation>Dom</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished"/>
+        <translation>Seg</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished"/>
+        <translation>Ter</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished"/>
+        <translation>Qua</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished"/>
+        <translation>Qui</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished"/>
+        <translation>Sex</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished"/>
+        <translation>Sáb</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished"/>
+        <translation>Jan</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished"/>
+        <translation>Fev</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished"/>
+        <translation>Mar</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
@@ -2974,12 +2991,12 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished"/>
+        <translation>Jun</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished"/>
+        <translation>Jul</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
@@ -2989,22 +3006,22 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished"/>
+        <translation>Set</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished"/>
+        <translation>Out</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished"/>
+        <translation>Nov</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished"/>
+        <translation>Dez</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
@@ -3059,12 +3076,12 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished"/>
+        <translation>roupa seca</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished"/>
+        <translation>semi-seca</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
@@ -3084,7 +3101,7 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished"/>
+        <translation>long john</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts
index a5e32902f..d3ae7f731 100644
--- a/translations/subsurface_pt_PT.ts
+++ b/translations/subsurface_pt_PT.ts
@@ -75,57 +75,57 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
         <translation>Pressão de serviço</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
         <translation>Pressão inicial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
         <translation>Pressão final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation>% O2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation>Trocar aos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
-        <translation type="unfinished"/>
+        <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <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="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation>A garrafa não pode ser eliminada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <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="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation>Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation>ID do dispositivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation>Alcunha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <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="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
         <translation>pés cúbicos/min</translation>
     </message>
@@ -194,87 +194,87 @@ remover o computador de mergulho seleccionado?</translation>
         <translation>Mostrar caixa de busca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
-        <translation type="unfinished"/>
+        <translation>Visível:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation>expandir todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation>colapsar todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation>colapsar outros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>remove dive(s) from trip</source>
         <translation>remover mergulho(s) desta viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
         <translation>criar nova viagem acima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>add dive(s) to trip immediately above</source>
-        <translation type="unfinished"/>
+        <translation>adicionar mergulho(s) à viagem imediatamente acima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <source>merge trip with trip above</source>
         <translation>juntar viagem com a viagem acima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <source>merge trip with trip below</source>
         <translation>juntar viagem com a viagem abaixo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
         <translation>eliminar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
         <translation>gravar como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
         <translation>exportar como UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
         <translation>mudar os tempos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation>Gravar mergulhos como...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation>Gravar ficheiro como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Ficheiros UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation>juntar os mergulhos seleccionados</translation>
     </message>
@@ -407,67 +407,67 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
-        <translation type="unfinished"/>
+        <translation>data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation>pés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation>libras</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
-        <translation type="unfinished"/>
+        <translation>fato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
-        <translation type="unfinished"/>
+        <translation>garrafa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
-        <translation type="unfinished"/>
+        <translation>local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation>Consumo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation>CNS máx</translation>
     </message>
@@ -540,16 +540,24 @@ Por favor, remova-os primeiro</translation>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation>Editar locais seleccionados</translation>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <source>Dive Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation>Localização</translation>
     </message>
@@ -571,17 +579,17 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Start time</source>
-        <translation type="unfinished"/>
+        <translation>hora de início</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <source>Air temp</source>
-        <translation type="unfinished"/>
+        <translation>Temperatura do ar</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <source>Water temp</source>
-        <translation type="unfinished"/>
+        <translation>Temperatura</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="127"/>
@@ -589,212 +597,222 @@ Por favor, remova-os primeiro</translation>
         <translation>Etiquetas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation>Visibilidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation>Fato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation>Equipamento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation>Informações do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation>Intervalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
         <translation>Gases usados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
         <translation>Gás consumido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation>Consumo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation>Prof. Máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation>Prof. Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
         <translation>Pressão </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation>Temperatura do ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation>Temperatura da água</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation>Duração do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
         <translation>Salinidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation>Estatísticas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation>Tempo total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation>Mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Garrafas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Adicionar garrafa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Lastro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Adicionar sistema de lastro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation>Local da viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation>Notas sobre a viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation>Esta viagem está a ser editada. Seleccionar Gravar ou Cancelar quando terminar.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation>Gravar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <source>This trip is being edited.</source>
+        <translation>Esta viagem está a ser editada.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation>Está a editar vários mergulhos. Seleccionar Gravar ou Cancelar quando terminar.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <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="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation>Este mergulho está a ser editado. Seleccionar Gravar ou Cancelar quando terminar.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <source>This dive is being edited.</source>
+        <translation>Este mergulho está a ser editado.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation>O</translation>
     </message>
@@ -1167,7 +1185,7 @@ Por favor, remova-os primeiro</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation>Gravar ficheiro como</translation>
     </message>
@@ -1177,7 +1195,7 @@ Por favor, remova-os primeiro</translation>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
@@ -1187,7 +1205,7 @@ Por favor, remova-os primeiro</translation>
         <translation>Ficheiros UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1492,7 +1510,7 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="39"/>
         <source>Print</source>
-        <translation type="unfinished"/>
+        <translation>Imprimir</translation>
     </message>
 </context>
 <context>
@@ -1616,106 +1634,106 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
-        <translation type="unfinished"/>
+        <translation>Adicionar troca de gás</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
-        <translation type="unfinished"/>
+        <translation>Adicionar marcador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
-        <translation type="unfinished"/>
+        <translation>Remover evento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
-        <translation type="unfinished"/>
+        <translation>Esconder eventos semelhantes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation>Esconder eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation>Esconder todos os %1 eventos?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation>Remover o evento seleccionado?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation>computador de mergulho desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation>Duração prevista: 10 minutos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation>Escala</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation>Régua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation>Medir propriedades dos segmentos do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation>Redimensionar o mergulho ao tamanho do ecrã</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Troca de emergência para circuito aberto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>iniciar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>fim</translation>
@@ -1724,74 +1742,74 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
         <translation>Mergulho #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
         <translation>Prof. Máxima: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
         <translation>Duração: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
-        <translation type="unfinished"/>
+        <translation>Gás usado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
-        <translation type="unfinished"/>
+        <translation>Consumo:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
-        <translation type="unfinished"/>
+        <translation>CNS máximo:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
-        <translation type="unfinished"/>
+        <translation>Lastro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
-        <translation type="unfinished"/>
+        <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
-        <translation type="unfinished"/>
+        <translation>Guia:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
-        <translation type="unfinished"/>
+        <translation>Companheiro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
-        <translation type="unfinished"/>
+        <translation>Fato:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
-        <translation type="unfinished"/>
+        <translation>Visibilidade:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
-        <translation type="unfinished"/>
+        <translation>Classificação:</translation>
     </message>
 </context>
 <context>
@@ -1807,16 +1825,11 @@ Por favor, remova-os primeiro</translation>
         <translation>Remover este ponto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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/globe.cpp" line="251"/>
-        <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation>A editar o mergulho - 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>
@@ -1888,7 +1901,7 @@ Por favor, remova-os primeiro</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 type="unfinished"/>
+        <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 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;</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
@@ -1911,7 +1924,7 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>Wait a bit until we have something...</source>
-        <translation type="unfinished"/>
+        <translation>Espere um pouco até termos algo...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
@@ -1950,17 +1963,17 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1968,7 +1981,7 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
@@ -1976,12 +1989,12 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2027,17 +2040,17 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation>Ao clicar aqui irá remover este sistema de lastro</translation>
     </message>
@@ -2045,79 +2058,79 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Ano
 &gt;Mês / Viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation>Duração
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation>
 Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation>
 Mais curto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation>
 Mais longo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation>Profundidade (%1)
 Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
         <translation>
 Mínimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
         <translation>
 Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation>Consumo (%1)
 Médio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temperatura (%1)
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts
index 34f31b1e0..8e4c4f4d7 100644
--- a/translations/subsurface_ru_RU.ts
+++ b/translations/subsurface_ru_RU.ts
@@ -75,57 +75,57 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation>Объем</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
         <translation>Раб.давл.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
         <translation>Нач.давл.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
         <translation>Кон.давл.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation>O2%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation>Замена на</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Удалить этот баллон.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation>Баллон не может быть удален</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <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="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation>Модель</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation>Идентификатор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation>Имя устройства</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <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="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation>л/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
         <translation>куб.фут/мин</translation>
     </message>
@@ -194,87 +194,87 @@
         <translation>Показать поле поиска</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
         <translation>Показывать:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation>развернуть все</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation>свернуть все</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation>свернуть остальные</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>remove dive(s) from trip</source>
         <translation>удалить погружение(-я) из поездки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
         <translation>создать новую поездку выше</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>add dive(s) to trip immediately above</source>
         <translation>добавить к поездке выше</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <source>merge trip with trip above</source>
         <translation>объединить с поездкой выше</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <source>merge trip with trip below</source>
         <translation>объединить с поездкой ниже</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
         <translation>удалить погружение(-я)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
         <translation>сохранить как</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
         <translation>экспорт UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
         <translation>сдвинуть время</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation>Сохранить погружения как...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF файлы (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation>объединить выбранные </translation>
     </message>
@@ -407,67 +407,67 @@ Please, remove them first.</source>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
         <translation>дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation>фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
         <translation>костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
         <translation>баллон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
         <translation>местоположение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation>макс.CNS</translation>
     </message>
@@ -540,16 +540,24 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation>Изменить место погружений</translation>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <source>Dive Notes</source>
         <translation>Погружение</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
@@ -589,212 +597,222 @@ Please, remove them first.</source>
         <translation>Метки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation>Видимость</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation>Костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation>Примечания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation>Снаряжение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation>Интервал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
         <translation>Исп. газы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
         <translation>Расход газа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation>Макс. глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation>Ср. глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
         <translation>Давление воздуха</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation>Температура воздуха</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation>Температура воды</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation>Время погр.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
         <translation>Соленость</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation>Статистика</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation>Глуб.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation>Общее время</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation>Погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Баллоны</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Добавить баллон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Грузы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Добавить груз</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation>Местонахождение поездки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation>Заметки к поездке</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation>Редактирование поездки. Нажмите Сохранить и Отменить по завершении.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation>Сохранить</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <source>This trip is being edited.</source>
+        <translation>Редактирование поездки.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation>Множественное редактирование. Нажмите Сохранить и Отменить по завершении.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <source>Multiple dives are being edited.</source>
+        <translation>Множественное редактирование.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation>Редактирование погружения. Нажмите Сохранить и Отменить по завершении.</translation>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <source>This dive is being edited.</source>
+        <translation>Редактирование погружения.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation>/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation>С</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation>Ю</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation>В</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation>З</translation>
     </message>
@@ -1167,7 +1185,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation>Сохранить как</translation>
     </message>
@@ -1177,7 +1195,7 @@ Please, remove them first.</source>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
@@ -1187,7 +1205,7 @@ Please, remove them first.</source>
         <translation>UDDF файлы (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1616,106 +1634,106 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
         <translation>Добавить замену смеси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
         <translation>Добавить закладку</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
         <translation>Удалить событие</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
         <translation>Скрыть похожие события</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation>Спрятать события</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation>Спрятать все события %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation>Удалить выбранное событие?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation>неизвестный компьютер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation>Длительность: 10 мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation>Масштаб</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation>Рулетка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation>Параметры сегмента погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation>Масштаб по размеру экрана</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation>Редактировать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>воздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Переход на Откр. Цикл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> начало</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> конец</translation>
@@ -1724,72 +1742,72 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
         <translation>Погружение №%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
         <translation>Макс. глубина: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
         <translation>Длительность: %1 мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
         <translation>Газы:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
         <translation>Макс. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
         <translation>Грузы:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
         <translation>Заметки:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
         <translation>Инструктор:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
         <translation>Напарник:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
         <translation>Костюм:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
         <translation>Видимость:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
         <translation>Рейтинг:</translation>
     </message>
@@ -1807,16 +1825,11 @@ Please, remove them first.</source>
         <translation>Удалить эту точку</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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/globe.cpp" line="251"/>
-        <source>Editing dive - 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>
@@ -1950,17 +1963,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation>мл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation>Бар</translation>
     </message>
@@ -1968,7 +1981,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
@@ -1976,12 +1989,12 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
@@ -2027,17 +2040,17 @@ Please, remove them first.</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation>Вес</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation>Удалить эту грузовую систему.</translation>
     </message>
@@ -2045,79 +2058,79 @@ Please, remove them first.</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Год 
  &gt; Месяц / Поездка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation>Длительность
 Общее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation>
 Среднее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation>
 Кратчайшее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation>
 Самое долгое</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation>Глубина (%1)
 Среднее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
         <translation>
 Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
         <translation>
 Максимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Среднее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Темп. (%1)
diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts
index 749a9f11f..f6df66c0a 100644
--- a/translations/subsurface_sk_SK.ts
+++ b/translations/subsurface_sk_SK.ts
@@ -75,57 +75,57 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation>Veľkosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <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="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation>Voliteľný názov</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <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="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
         <translation type="unfinished"/>
     </message>
@@ -193,87 +193,87 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <source>merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <source>merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation type="unfinished"/>
     </message>
@@ -405,67 +405,67 @@ Please, remove them first.</source>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation>US libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation>Spotreba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation>max. CNS</translation>
     </message>
@@ -538,16 +538,24 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <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="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation>Miesto</translation>
     </message>
@@ -587,212 +595,222 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation>Hodnotenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation>Viditeľnosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation>Oblek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation>Poznámky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation>Výstroj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation>Informácie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation>Spotreba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation>Čas Ponoru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation>Štatistiky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation>Celkový čas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation>Ponory</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Fľaše</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -1165,7 +1183,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </message>
@@ -1175,7 +1193,7 @@ Please, remove them first.</source>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
@@ -1185,7 +1203,7 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
@@ -1614,106 +1632,106 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation>Editovať</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>vzduch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Záchrana na OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>začiatok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>koniec</translation>
@@ -1722,72 +1740,72 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -1805,16 +1823,11 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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/globe.cpp" line="251"/>
-        <source>Editing dive - 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>
@@ -1948,17 +1961,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1966,7 +1979,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -1974,12 +1987,12 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2025,17 +2038,17 @@ Please, remove them first.</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation>Závažie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation type="unfinished"/>
     </message>
@@ -2043,70 +2056,70 @@ Please, remove them first.</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"/>
diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts
index 0ea0d9a4e..121d7db04 100644
--- a/translations/subsurface_sv_SE.ts
+++ b/translations/subsurface_sv_SE.ts
@@ -75,57 +75,57 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Size</source>
         <translation>Storlek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>WorkPress</source>
         <translation>Arbetstryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>StartPress</source>
         <translation>Starttryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>EndPress</source>
         <translation>Sluttryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>O2%</source>
         <translation>O2%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>Switch at</source>
         <translation>Byt vid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="65"/>
+        <location filename="../qt-ui/models.cpp" line="66"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="163"/>
+        <location filename="../qt-ui/models.cpp" line="164"/>
         <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="385"/>
+        <location filename="../qt-ui/models.cpp" line="386"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flaska kan inte tas bort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="386"/>
+        <location filename="../qt-ui/models.cpp" line="387"/>
         <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="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Model</source>
         <translation>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Device ID</source>
         <translation>Enhetsid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1235"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
         <source>Nickname</source>
         <translation>Enhetsnamn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1265"/>
         <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="1096"/>
+        <location filename="../qt-ui/models.cpp" line="1104"/>
         <source> l/min</source>
         <translation> l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1098"/>
+        <location filename="../qt-ui/models.cpp" line="1106"/>
         <source> cuft/min</source>
         <translation> cuft/min</translation>
     </message>
@@ -194,87 +194,87 @@ radera den valda dykdatorn?</translation>
         <translation>Visa sökruta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="316"/>
+        <location filename="../qt-ui/divelistview.cpp" line="380"/>
         <source>Visible:</source>
         <translation>Synlig:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="631"/>
+        <location filename="../qt-ui/divelistview.cpp" line="695"/>
         <source>expand all</source>
         <translation>Expandera alla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="632"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>collapse all</source>
         <translation>Sammanslå alla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="633"/>
+        <location filename="../qt-ui/divelistview.cpp" line="697"/>
         <source>collapse others</source>
         <translation>kollapsa andra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="635"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <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="636"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>create new trip above</source>
         <translation>skapa nytt resmål ovan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="637"/>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <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="640"/>
+        <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <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="641"/>
+        <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <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="645"/>
+        <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>delete dive(s)</source>
         <translation>radera dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="649"/>
+        <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>save As</source>
         <translation>Spara som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>export As UDDF</source>
         <translation>Exportera som UDDF fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="651"/>
+        <location filename="../qt-ui/divelistview.cpp" line="715"/>
         <source>shift times</source>
         <translation>skifta tider</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="678"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Save Dives As...</source>
         <translation>Spara dyk som...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="761"/>
         <source>Save File as</source>
         <translation>Spara fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="698"/>
+        <location filename="../qt-ui/divelistview.cpp" line="762"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="647"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>merge selected dives</source>
         <translation>Sammanslå dyk</translation>
     </message>
@@ -407,67 +407,67 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1139"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1140"/>
+        <location filename="../qt-ui/models.cpp" line="1148"/>
         <source>date</source>
         <translation>datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1142"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1143"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1145"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1146"/>
+        <location filename="../qt-ui/models.cpp" line="1154"/>
         <source>suit</source>
         <translation>dräkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>cyl</source>
         <translation>flaska</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1152"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>location</source>
         <translation>plats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1149"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1158"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -540,16 +540,24 @@ vänligen ta bort dessa först.</translation>
     </message>
 </context>
 <context>
+    <name>GlobeGPS</name>
+    <message>
+        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <source>Edit Selected Dive Locations</source>
+        <translation>Ändra valda dykplatser</translation>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="366"/>
+        <location filename="../qt-ui/maintab.cpp" line="367"/>
         <source>Dive Notes</source>
         <translation>Dykanteckningar</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="390"/>
+        <location filename="../qt-ui/maintab.cpp" line="391"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
@@ -589,212 +597,222 @@ vänligen ta bort dessa först.</translation>
         <translation>Taggar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="185"/>
+        <location filename="../qt-ui/maintab.ui" line="192"/>
         <source>Rating</source>
         <translation>Rankning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="199"/>
         <source>Visibility</source>
         <translation>Synlighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="215"/>
         <source>Suit</source>
         <translation>Dräkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="225"/>
-        <location filename="../qt-ui/maintab.cpp" line="391"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.cpp" line="392"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="269"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <source>Equipment</source>
         <translation>Utrustning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="356"/>
+        <location filename="../qt-ui/maintab.ui" line="342"/>
         <source>Dive Info</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="398"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="417"/>
+        <location filename="../qt-ui/maintab.ui" line="403"/>
         <source>Interval</source>
         <translation>Intervall</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../qt-ui/maintab.ui" line="422"/>
         <source>Gases Used</source>
         <translation>Gasanvändning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="455"/>
+        <location filename="../qt-ui/maintab.ui" line="441"/>
         <source>Gas Consumed</source>
         <translation>Gasanvändning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="474"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="460"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="493"/>
+        <location filename="../qt-ui/maintab.ui" line="479"/>
         <source>Max. Depth</source>
         <translation>Maxdjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="498"/>
         <source>Ave. Depth</source>
         <translation>Medeldjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="531"/>
+        <location filename="../qt-ui/maintab.ui" line="517"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="550"/>
+        <location filename="../qt-ui/maintab.ui" line="536"/>
         <source>Air Pressure</source>
         <translation>Lufttryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="569"/>
+        <location filename="../qt-ui/maintab.ui" line="555"/>
         <source>Air Temperature</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="588"/>
+        <location filename="../qt-ui/maintab.ui" line="574"/>
         <source>Water Temperature</source>
         <translation>Vattentemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="607"/>
+        <location filename="../qt-ui/maintab.ui" line="593"/>
         <source>Dive Time</source>
         <translation>Dyktid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="612"/>
         <source>Salinity</source>
         <translation>Salthalt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="663"/>
+        <location filename="../qt-ui/maintab.ui" line="649"/>
         <source>Stats</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="691"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="727"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="739"/>
         <source>Total Time</source>
         <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Dives</source>
         <translation>Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Cylinders</source>
         <translation>Flaskor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="71"/>
+        <location filename="../qt-ui/maintab.cpp" line="79"/>
         <source>Add Cylinder</source>
         <translation>Lägg till flaska</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Weights</source>
         <translation>Vikter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="75"/>
+        <location filename="../qt-ui/maintab.cpp" line="83"/>
         <source>Add Weight System</source>
         <translation>Lägg till Viktsystem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="361"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Location</source>
         <translation>Resmål</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
-        <location filename="../qt-ui/maintab.cpp" line="363"/>
+        <location filename="../qt-ui/maintab.cpp" line="340"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>Trip Notes</source>
         <translation>Resmålsanteckningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="177"/>
-        <location filename="../qt-ui/maintab.cpp" line="179"/>
-        <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation>Detta resmål håller på och ändras, välj Spara eller Avbryt när du är klar</translation>
+        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <source>Save</source>
+        <translation>Spara</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="178"/>
+        <location filename="../qt-ui/maintab.cpp" line="180"/>
+        <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="186"/>
         <location filename="../qt-ui/maintab.cpp" line="187"/>
-        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation>Flera dyk håller på och ändras. Välj Spara eller Avbryt när du är klar</translation>
+        <location filename="../qt-ui/maintab.cpp" line="188"/>
+        <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="189"/>
         <location filename="../qt-ui/maintab.cpp" line="190"/>
-        <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation>Detta dyk håller på och ändras. Välj Spara eller Avbryt när du är klar</translation>
+        <location filename="../qt-ui/maintab.cpp" line="191"/>
+        <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="407"/>
-        <location filename="../qt-ui/maintab.cpp" line="415"/>
-        <location filename="../qt-ui/maintab.cpp" line="444"/>
+        <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"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="409"/>
+        <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>unknown</source>
         <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="902"/>
+        <location filename="../qt-ui/maintab.cpp" line="905"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="903"/>
+        <location filename="../qt-ui/maintab.cpp" line="906"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -1167,7 +1185,7 @@ vänligen ta bort dessa först.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="724"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="729"/>
         <source>Save File as</source>
         <translation>Spara fil som</translation>
     </message>
@@ -1177,7 +1195,7 @@ vänligen ta bort dessa först.</translation>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="847"/>
         <source>Warning</source>
         <translation>Varning</translation>
     </message>
@@ -1187,7 +1205,7 @@ vänligen ta bort dessa först.</translation>
         <translation>UDDF filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="730"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1616,106 +1634,106 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="133"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
         <translation>Lägg till gasbyte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="144"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
         <translation>Lägg till bokmärke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="152"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
         <translation>Ta bort händelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="157"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
         <translation>Göm liknande händelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
         <translation>Göm händelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
         <translation>Göm alla %1händelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
         <translation>Ta bort markerad händelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="386"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="388"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
         <translation>Okänd dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="466"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation>Sätt varaktighet: 10 minuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation>Skala</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation>Linjal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
         <translation>Mätegenskaper på dyksegment</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
         <translation>Skala dyk till skärmstorlek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
         <translation>Redigera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="731"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="983"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="733"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="993"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Bailout till öppet system</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="995"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>start</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>slut</translation>
@@ -1724,72 +1742,72 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1593"/>
+        <location filename="../qt-ui/models.cpp" line="1600"/>
         <source>unknown</source>
         <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1598"/>
+        <location filename="../qt-ui/models.cpp" line="1605"/>
         <source>Dive #%1 - %2</source>
         <translation>Dyk #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1601"/>
+        <location filename="../qt-ui/models.cpp" line="1608"/>
         <source>Max depth: %1 %2</source>
         <translation>Maxdjup: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1608"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>Duration: %1 min</source>
         <translation>Varaktighet: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1613"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Gas Used:</source>
         <translation>Gas använd:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1615"/>
+        <location filename="../qt-ui/models.cpp" line="1622"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1617"/>
+        <location filename="../qt-ui/models.cpp" line="1624"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Weights:</source>
         <translation>Vikter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1631"/>
         <source>Notes:</source>
         <translation>Anteckningar:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1633"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>Buddy:</source>
         <translation>Parkamrat:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1635"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Suit:</source>
         <translation>Dräkt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1637"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Viz:</source>
         <translation>Sikt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Rating:</source>
         <translation>Ranking:</translation>
     </message>
@@ -1807,16 +1825,11 @@ vänligen ta bort dessa först.</translation>
         <translation>Ta bort denna punkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="239"/>
+        <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>Inga platsuppgifter - flytta kartan och dubbelklicka för att ställa in dykplats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="251"/>
-        <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation>Ändra dyk - Flytta runt 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>
@@ -1950,17 +1963,17 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="761"/>
+        <location filename="../qt-ui/models.cpp" line="769"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1968,7 +1981,7 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1527"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
@@ -1976,12 +1989,12 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="633"/>
+        <location filename="../qt-ui/models.cpp" line="641"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2027,17 +2040,17 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="400"/>
+        <location filename="../qt-ui/models.cpp" line="401"/>
         <source>Weight</source>
         <translation>Vikt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="460"/>
+        <location filename="../qt-ui/models.cpp" line="461"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation>Klicka här för att ta bort detta viktsystem</translation>
     </message>
@@ -2045,76 +2058,76 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1411"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>År
 &gt; Månad / Resmål</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1412"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1413"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Duration 
  Total</source>
         <translation>Varaktighet
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1414"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Average</source>
         <translation>Genomsnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1415"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Shortest</source>
         <translation>Kortaste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1416"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Longest</source>
         <translation>Längsta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1417"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>Depth (%1)
  Average</source>
         <translation>Djup (%1)
 Medel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1418"/>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1429"/>
+        <location filename="../qt-ui/models.cpp" line="1432"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1433"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1428"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Medel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1431"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)