Update translations strings

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

1 files changed, 91 insertions, 76 deletions

diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts
index e9711abfe..a4de207ab 100644
--- a/translations/subsurface_en_GB.ts
+++ b/translations/subsurface_en_GB.ts
@@ -16,7 +16,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2454"/>
+        <location filename="../qt-ui/models.cpp" line="2456"/>
         <source>No buddies</source>
         <translation>No buddies</translation>
     </message>
@@ -1207,87 +1207,87 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="781"/>
+        <location filename="../qt-ui/divelistview.cpp" line="784"/>
         <source>Expand all</source>
         <translation>Expand all</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="782"/>
+        <location filename="../qt-ui/divelistview.cpp" line="785"/>
         <source>Collapse all</source>
         <translation>Collapse all</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="783"/>
+        <location filename="../qt-ui/divelistview.cpp" line="786"/>
         <source>Collapse others</source>
         <translation>Collapse others</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="785"/>
+        <location filename="../qt-ui/divelistview.cpp" line="788"/>
         <source>Remove dive(s) from trip</source>
         <translation>Remove dive(s) from trip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="786"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Create new trip above</source>
         <translation>Create new trip above</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="800"/>
+        <location filename="../qt-ui/divelistview.cpp" line="803"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Add dive(s) to trip immediately above</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="802"/>
+        <location filename="../qt-ui/divelistview.cpp" line="805"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Add dive(s) to trip immediately below</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="809"/>
         <source>Merge trip with trip above</source>
         <translation>Merge trip with trip above</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="807"/>
+        <location filename="../qt-ui/divelistview.cpp" line="810"/>
         <source>Merge trip with trip below</source>
         <translation>Merge trip with trip below</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="811"/>
+        <location filename="../qt-ui/divelistview.cpp" line="814"/>
         <source>Delete dive(s)</source>
         <translation>Delete dive(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="816"/>
         <source>Mark dive(s) invalid</source>
         <translation>Mark dive(s) invalid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="820"/>
         <source>Merge selected dives</source>
         <translation>Merge selected dives</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="822"/>
         <source>Renumber dive(s)</source>
         <translation>Renumber dive(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="820"/>
+        <location filename="../qt-ui/divelistview.cpp" line="823"/>
         <source>Shift times</source>
         <translation>Shift times</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="821"/>
+        <location filename="../qt-ui/divelistview.cpp" line="824"/>
         <source>Load images</source>
         <translation>Load images</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="842"/>
+        <location filename="../qt-ui/divelistview.cpp" line="845"/>
         <source>Open image files</source>
         <translation>Open image files</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="842"/>
+        <location filename="../qt-ui/divelistview.cpp" line="845"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1700,7 +1700,7 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="156"/>
+        <location filename="../qt-ui/diveplanner.ui" line="152"/>
         <source>Altitude</source>
         <translation>Altitude</translation>
     </message>
@@ -1710,20 +1710,30 @@
         <translation>Planned dive time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="163"/>
+        <location filename="../qt-ui/diveplanner.ui" line="159"/>
         <source>ATM pressure</source>
         <translation>ATM pressure</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="170"/>
+        <location filename="../qt-ui/diveplanner.ui" line="166"/>
+        <source>Salinity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.ui" line="179"/>
         <source>mbar</source>
         <translation>mbar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="183"/>
+        <location filename="../qt-ui/diveplanner.ui" line="198"/>
         <source>m</source>
         <translation>m</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.ui" line="220"/>
+        <source> kg/ℓ</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
@@ -1733,37 +1743,37 @@
         <translation>unknown</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="690"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Final depth</source>
         <translation>Final depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="692"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="694"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
         <source>Duration</source>
         <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="696"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
         <source>Used gas</source>
         <translation>Used gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="698"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
         <source>CC set point</source>
         <translation>CC set point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1031"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
         <source>Discard the plan?</source>
         <translation>Discard the plan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1032"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
         <source>You are about to discard your plan.</source>
         <translation>You are about to discard your plan.</translation>
     </message>
@@ -1786,7 +1796,7 @@
         <translation>Add dive data point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="303"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
         <source>Save new</source>
         <translation>Save new</translation>
     </message>
@@ -2324,7 +2334,7 @@
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2580"/>
+        <location filename="../qt-ui/models.cpp" line="2582"/>
         <source>No location set</source>
         <translation>No location set</translation>
     </message>
@@ -2451,7 +2461,7 @@
     <message>
         <location filename="../qt-ui/maintab.ui" line="964"/>
         <source>Additional data from dive computer</source>
-        <translation type="unfinished"/>
+        <translation>Additional data from dive computer</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="305"/>
@@ -3229,54 +3239,54 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>Last stop at 20ft</source>
         <translation>Last stop at 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% avg. depth to 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
         <source>20ft to surface</source>
         <translation>20ft to surface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>Last stop at 6m</source>
         <translation>Last stop at 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% avg. depth to 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
         <source>6m to surface</source>
         <translation>6m to surface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="490"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="499"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
@@ -4807,8 +4817,8 @@ Maximum</translation>
     <message>
         <location filename="../divelist.c" line="464"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1003"/>
-        <location filename="../planner.c" line="1006"/>
+        <location filename="../planner.c" line="1004"/>
+        <location filename="../planner.c" line="1007"/>
         <source>air</source>
         <translation>air</translation>
     </message>
@@ -5122,6 +5132,11 @@ Maximum</translation>
         <translation>Unable to open %s %s (%s)</translation>
     </message>
     <message>
+        <location filename="../libdivecomputer.c" line="853"/>
+        <source>Insufficient privileges to open the device %s %s (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../parse-xml.c" line="481"/>
         <source>Strange percentage reading %s
 </source>
@@ -5194,136 +5209,136 @@ Maximum</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="769"/>
+        <location filename="../planner.c" line="770"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Can&apos;t find gas %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="354"/>
+        <location filename="../planner.c" line="355"/>
         <source>Too many gas mixes</source>
         <translation>Too many gas mixes</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="531"/>
+        <location filename="../planner.c" line="532"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Decompression calculation aborted due to excessive time</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
+        <location filename="../planner.c" line="540"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>based on GFlow = %d and GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="543"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface dive plan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="547"/>
         <source>depth</source>
         <translation>depth</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="549"/>
+        <location filename="../planner.c" line="550"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="553"/>
         <source>duration</source>
         <translation>duration</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="555"/>
+        <location filename="../planner.c" line="556"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="589"/>
+        <location filename="../planner.c" line="590"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="599"/>
+        <location filename="../planner.c" line="600"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="610"/>
+        <location filename="../planner.c" line="611"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="613"/>
-        <location filename="../planner.c" line="617"/>
+        <location filename="../planner.c" line="614"/>
+        <location filename="../planner.c" line="618"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="633"/>
+        <location filename="../planner.c" line="634"/>
         <source>Switch gas to %s</source>
         <translation>Switch gas to %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="646"/>
+        <location filename="../planner.c" line="647"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="648"/>
+        <location filename="../planner.c" line="649"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="652"/>
+        <location filename="../planner.c" line="653"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gas consumption (CCR legs excluded):</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="654"/>
+        <location filename="../planner.c" line="655"/>
         <source>Gas consumption:</source>
         <translation>Gas consumption:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
-        <location filename="../planner.c" line="674"/>
-        <location filename="../planner.c" line="679"/>
-        <location filename="../planner.c" line="702"/>
+        <location filename="../planner.c" line="534"/>
+        <location filename="../planner.c" line="675"/>
+        <location filename="../planner.c" line="680"/>
+        <location filename="../planner.c" line="703"/>
         <source>Warning:</source>
         <translation>Warning:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="521"/>
+        <location filename="../planner.c" line="522"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="675"/>
+        <location filename="../planner.c" line="676"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>this is more gas than available in the specified cylinder!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="680"/>
+        <location filename="../planner.c" line="681"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>not enough reserve for gas sharing on ascent!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="682"/>
+        <location filename="../planner.c" line="683"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="684"/>
+        <location filename="../planner.c" line="685"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s during planned ascent) of %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="700"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1007"/>
+        <location filename="../planner.c" line="1008"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>