Merge branch 'v4.0-branch'

Bring in the tag, the translations changes and edits preparing for 4.0.2
into master. This should make "git describe" on master create something
reasonably sensible...

1 files changed, 136 insertions, 96 deletions

diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts
index e8c084810..532107603 100644
--- a/translations/subsurface_source.ts
+++ b/translations/subsurface_source.ts
@@ -122,15 +122,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="372"/>
+        <location filename="../qt-ui/models.cpp" line="331"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="373"/>
+        <location filename="../qt-ui/models.cpp" line="332"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="478"/>
+        <source>psi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="479"/>
+        <source>bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="502"/>
+        <source>l</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="503"/>
+        <source>cuft</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -154,22 +174,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1246"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>Model</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1246"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1246"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1268"/>
+        <location filename="../qt-ui/models.cpp" line="1320"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -177,12 +197,12 @@
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1107"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1109"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -406,67 +426,67 @@ Please, remove them first.</source>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1202"/>
         <source>#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1203"/>
         <source>date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1205"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1205"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1154"/>
+        <location filename="../qt-ui/models.cpp" line="1206"/>
         <source>min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1156"/>
+        <location filename="../qt-ui/models.cpp" line="1208"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1156"/>
+        <location filename="../qt-ui/models.cpp" line="1208"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1209"/>
         <source>suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1210"/>
         <source>cyl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1163"/>
+        <location filename="../qt-ui/models.cpp" line="1215"/>
         <source>location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1212"/>
         <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1161"/>
+        <location filename="../qt-ui/models.cpp" line="1213"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1162"/>
+        <location filename="../qt-ui/models.cpp" line="1214"/>
         <source>maxCNS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -615,22 +635,22 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -707,13 +727,13 @@ Please, remove them first.</source>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="425"/>
+        <location filename="../qt-ui/maintab.cpp" line="431"/>
         <source>Dive Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="449"/>
+        <location filename="../qt-ui/maintab.cpp" line="455"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
@@ -769,7 +789,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="450"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -900,13 +920,13 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="418"/>
+        <location filename="../qt-ui/maintab.cpp" line="424"/>
         <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="396"/>
-        <location filename="../qt-ui/maintab.cpp" line="420"/>
+        <location filename="../qt-ui/maintab.cpp" line="402"/>
+        <location filename="../qt-ui/maintab.cpp" line="426"/>
         <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -921,51 +941,51 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="238"/>
+        <location filename="../qt-ui/maintab.cpp" line="244"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="244"/>
+        <location filename="../qt-ui/maintab.cpp" line="250"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="246"/>
+        <location filename="../qt-ui/maintab.cpp" line="252"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="472"/>
-        <location filename="../qt-ui/maintab.cpp" line="480"/>
-        <location filename="../qt-ui/maintab.cpp" line="509"/>
-        <location filename="../qt-ui/maintab.cpp" line="510"/>
-        <location filename="../qt-ui/maintab.cpp" line="511"/>
+        <location filename="../qt-ui/maintab.cpp" line="478"/>
+        <location filename="../qt-ui/maintab.cpp" line="486"/>
+        <location filename="../qt-ui/maintab.cpp" line="515"/>
+        <location filename="../qt-ui/maintab.cpp" line="516"/>
+        <location filename="../qt-ui/maintab.cpp" line="517"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="474"/>
+        <location filename="../qt-ui/maintab.cpp" line="480"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="983"/>
+        <location filename="../qt-ui/maintab.cpp" line="989"/>
         <source>N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="983"/>
+        <location filename="../qt-ui/maintab.cpp" line="989"/>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="984"/>
+        <location filename="../qt-ui/maintab.cpp" line="990"/>
         <source>E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="984"/>
+        <location filename="../qt-ui/maintab.cpp" line="990"/>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1983,72 +2003,72 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1619"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1676"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1627"/>
+        <location filename="../qt-ui/models.cpp" line="1679"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1634"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1639"/>
+        <location filename="../qt-ui/models.cpp" line="1691"/>
         <source>Gas Used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1641"/>
+        <location filename="../qt-ui/models.cpp" line="1693"/>
         <source>SAC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1643"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>Max. CNS:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1645"/>
+        <location filename="../qt-ui/models.cpp" line="1697"/>
         <source>Weights:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1702"/>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1657"/>
+        <location filename="../qt-ui/models.cpp" line="1709"/>
         <source>Divemaster:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1711"/>
         <source>Buddy:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1661"/>
+        <location filename="../qt-ui/models.cpp" line="1713"/>
         <source>Suit:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1663"/>
+        <location filename="../qt-ui/models.cpp" line="1715"/>
         <source>Viz:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1717"/>
         <source>Rating:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2209,17 +2229,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="772"/>
+        <location filename="../qt-ui/models.cpp" line="824"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="772"/>
+        <location filename="../qt-ui/models.cpp" line="824"/>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="772"/>
+        <location filename="../qt-ui/models.cpp" line="824"/>
         <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2227,7 +2247,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1562"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2235,12 +2255,12 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="644"/>
+        <location filename="../qt-ui/models.cpp" line="696"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="644"/>
+        <location filename="../qt-ui/models.cpp" line="696"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2296,88 +2316,108 @@ Please, remove them first.</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="346"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="346"/>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="406"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="431"/>
+        <source>kg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="432"/>
+        <source>lbs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="455"/>
+        <source>ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="456"/>
+        <source>m</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1474"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1475"/>
         <source>#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1425"/>
+        <location filename="../qt-ui/models.cpp" line="1477"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1426"/>
+        <location filename="../qt-ui/models.cpp" line="1478"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1427"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1428"/>
+        <location filename="../qt-ui/models.cpp" line="1480"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1429"/>
-        <location filename="../qt-ui/models.cpp" line="1432"/>
-        <location filename="../qt-ui/models.cpp" line="1435"/>
+        <location filename="../qt-ui/models.cpp" line="1481"/>
+        <location filename="../qt-ui/models.cpp" line="1484"/>
+        <location filename="../qt-ui/models.cpp" line="1487"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
-        <location filename="../qt-ui/models.cpp" line="1433"/>
-        <location filename="../qt-ui/models.cpp" line="1436"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1485"/>
+        <location filename="../qt-ui/models.cpp" line="1488"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1431"/>
+        <location filename="../qt-ui/models.cpp" line="1483"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1434"/>
+        <location filename="../qt-ui/models.cpp" line="1486"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -2695,77 +2735,77 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="618"/>
+        <location filename="../libdivecomputer.c" line="619"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="626"/>
+        <location filename="../libdivecomputer.c" line="627"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="687"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="673"/>
+        <location filename="../libdivecomputer.c" line="692"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="693"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Dive data import error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="729"/>
+        <location filename="../libdivecomputer.c" line="750"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="736"/>
+        <location filename="../libdivecomputer.c" line="757"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="480"/>
+        <location filename="../parse-xml.c" line="479"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1617"/>
+        <location filename="../parse-xml.c" line="1616"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1618"/>
+        <location filename="../parse-xml.c" line="1617"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1816"/>
+        <location filename="../parse-xml.c" line="1815"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1851"/>
+        <location filename="../parse-xml.c" line="1850"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1858"/>
+        <location filename="../parse-xml.c" line="1857"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1918"/>
+        <location filename="../parse-xml.c" line="1917"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"></translation>
     </message>