diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts
index a57017306..aa1ff15fa 100644
--- a/translations/subsurface_en_GB.ts
+++ b/translations/subsurface_en_GB.ts
@@ -138,7 +138,7 @@
- Show all BT devices
+ Show all Bluetooth devices
@@ -186,7 +186,7 @@
%1 will be replaced with "turned on" or "turned off"
- The local Bluetooth device was %1.
+ Local Bluetooth device was %1.
@@ -227,23 +227,23 @@
- The device %1 can be used for connection. You can press the Save button.
+ Device %1 can be used for connection. You can press the Save button.
- The device %1 must be paired in order to be used. Please use the context menu for pairing options.
+ Device %1 must be paired in order to be used. Please use the context menu for pairing options.
- A device needs a non-zero address for a connection.
+ Device needs a non-zero address for a connection.
- The local device was changed.
+ Local device was changed.
@@ -283,7 +283,7 @@
- The device %1 can now be used for connection. You can press the Save button.
+ Device %1 can now be used for connection. You can press the Save button.
@@ -663,7 +663,7 @@
- remove autogenerated trips
+ remove auto-generated trips
@@ -678,7 +678,7 @@
- autogroup dives
+ auto-group dives
@@ -886,7 +886,7 @@
- Replan dive
+ Re-plan dive
@@ -944,32 +944,32 @@
Add cylinder (%n dive(s))Add cylinder (%n dive(s))
-
+
Remove cylinder
-
+
Remove cylinder (%n dive(s))Remove cylinder (%n dive(s))
-
+
Edit cylinder
-
+
Edit cylinder (%n dive(s))Edit cylinder (%n dive(s))
-
+
Edit sensors
-
+
Edit dive [%1]
@@ -1188,51 +1188,51 @@
-
+
Basic settings
-
-
+
+
Serial No.
-
+
Length
-
-
+
+
Firmware version
-
-
+
+
Custom text
-
+
Number of dives
-
+
Show safety stop
@@ -1245,7 +1245,7 @@
-
+
Date format
@@ -1267,7 +1267,7 @@
-
+
Sync dive computer time with PC
@@ -1284,7 +1284,7 @@
-
+
Start Depth
@@ -1303,8 +1303,8 @@
-
-
+
+
s
@@ -1317,15 +1317,15 @@
-
-
+
+
m
-
+
Advanced settings
@@ -1344,7 +1344,7 @@
-
+
Future TTS
@@ -1365,33 +1365,33 @@
-
-
-
-
-
-
+
+
+
+
+
+
%
-
+
Decotype
-
+
ZH-L16
-
+
Gauge
@@ -1403,7 +1403,7 @@
-
+
Apnea
@@ -1425,30 +1425,30 @@
-
-
-
+
+
+
min
-
+
Last deco
-
+
Alt GFLow
-
+
Alt GFHigh
@@ -1461,14 +1461,14 @@
-
+
GFHigh
-
+
GFLow
@@ -1483,30 +1483,30 @@
-
-
-
+
+
+
ℓ/min
-
+
Bottom gas consumption
-
+
Deco gas consumption
-
+
Gas settings
@@ -1515,8 +1515,8 @@
-
-
+
+
%O₂
@@ -1525,8 +1525,8 @@
-
-
+
+
%He
@@ -1535,8 +1535,8 @@
-
-
+
+
Type
@@ -1547,107 +1547,107 @@
-
-
-
+
+
+
Change depth
-
+
Gas 1
-
+
Gas 2
-
+
Gas 3
-
+
Gas 4
-
+
Gas 5
-
+
Dil 1
-
+
Dil 2
-
+
Dil 3
-
+
Dil 4
-
+
Dil 5
-
+
Setpoint
-
+
SP 1
-
+
SP 2
-
+
SP 3
@@ -1656,125 +1656,125 @@
-
-
+
+
cbar
-
+
pO₂ max
-
+
pO₂ min
-
+
Eco
-
+
Medium
-
+
High
-
+
English
-
+
German
-
+
French
-
+
Italian
-
+
m/°C
-
+
ft/°F
-
+
MMDDYY
-
+
DDMMYY
-
+
YYMMDD
-
+
Language
-
+
Brightness
-
-
+
+
Units
-
+
Salinity (0-5%)
-
+
Reset device to default settings
@@ -1825,26 +1825,26 @@
-
-
+
+
Computer model
-
+
OC
-
+
CC
-
+
Dive mode
@@ -1855,37 +1855,37 @@
-
+
10s
-
+
Standard
-
+
Red
-
+
Green
-
+
Blue
-
+
Dive mode colour
@@ -1896,25 +1896,25 @@
-
+
Always show pO₂
-
+
Pressure sensor offset
-
+
mbar
-
+
ZH-L16+GF
@@ -1940,25 +1940,25 @@
-
+
Temperature sensor offset
-
+
°C
-
+
SP 4
-
+
SP 5
@@ -1969,13 +1969,13 @@
-
+
Fixed setpoint
-
+
Sensor
@@ -1985,135 +1985,140 @@
Auto SP
-
+
+
+ Cave
+
+
+
Travel gas consumption
-
+
Button sensitivity
-
+
VPM
-
+
VPM conservatism
-
+
+
-
+
Setpoint fallback
-
+
Safety level
-
+
Altitude range
-
+
Model
-
+
Max. depth
-
+
Suunto safety level
P0 (none)
-
+
Suunto safety level
P1 (medium)
-
+
Suunto safety level
P2 (high)
-
+
Sample rate
-
+
20s
-
+
30s
-
+
60s
-
+
Total dive time
-
+
24h
-
+
12h
-
+
Time format
-
+
Imperial
-
+
Metric
-
+
Light
-
+
Depth alarm
-
+
Time alarm
@@ -2419,68 +2424,68 @@
DiveComponentSelection
-
+
Dive site:
-
+
Dive guide:
-
+
Buddy:
-
+
Rating:
-
+
Visibility:
-
+
Notes:
-
+
Suit:
-
+
Tags:
-
+
Cylinders:
-
+
Weights:
-
+
Dive number:
-
+
Date / time:
@@ -2789,57 +2794,67 @@
Visibility:
-
+
No profile to show
-
+
+
+ prev.DC
+
+
+
+
+ next DC
+
+
+
Suit:
-
+
Air Temp:
-
+
Water Temp:
-
+
Cylinder:
-
+
Weight:
-
+
SAC:
-
+
Dive guide:
-
+
Buddy:
-
+
Tags:
-
+
Notes
@@ -2847,38 +2862,38 @@
DiveEventItem
-
+
(cyl. %1)
-
+
ICD
-
+
ΔHe
-
+
ΔN₂
-
+
Manual switch to OC
-
+
Starts with space!
begin
-
+
Starts with space!
end
@@ -3136,32 +3151,32 @@
Load media from web
-
+
Open media files
-
+
Media files
-
+
Image files
-
+
Video files
-
+
All files
-
+
%1 does not appear to be an image
@@ -3937,62 +3952,62 @@
DivePlannerPointsModel
-
+
unknown
-
+
cyl.
-
+
Final depth
-
+
Run time
-
+
Duration
-
+
Used gas
-
+
CC setpoint
-
+
Dive mode
-
+
min
-
+
m
-
+
ft
-
+
Stop times
@@ -4288,17 +4303,17 @@
Add cylinder
-
+
Add dive data point
-
+
Save new
-
+
kg/ℓ
@@ -4540,195 +4555,195 @@ p, li { white-space: pre-wrap; }
DiveTripModelBase
-
+
(%n dive)(%n dives)
-
+
(%L1 shown)
-
+
(%1 shown)
-
-
+
+
No.
-
-
+
+
Date
-
-
+
+
Rating
-
+
Depth(%1)
-
+
m
-
+
ft
-
-
+
+
Duration
-
+
Temp.(°%1)
-
+
Weight(%1)
-
+
kg
-
+
lbs
-
-
+
+
Suit
-
-
+
+
Cylinder
-
-
+
+
Gas
-
+
SAC(%1)
-
+
/min
-
-
+
+
OTU
-
+
Max. CNS
-
-
+
+
Tags
-
+
Media before/during/after dive
-
-
+
+
Country
-
-
+
+
Buddy
-
-
+
+
Dive guide
-
-
+
+
Location
-
+
Depth
-
+
Temp.
-
+
Weight
-
+
SAC
-
+
Max CNS
-
+
Media
-
+
Finish populating data store
-
+
Setting up internal data structures
-
+
Done setting up internal data structures
@@ -5514,32 +5529,32 @@ Existing Site
LocationFilterDelegate
-
+
(same GPS fix)
-
+
(~%1 away
-
+
, %n dive here), %n dives here)
-
+
(no existing GPS data, add GPS fix from this dive)
-
+
(no GPS data)
-
+
Pick site:
@@ -6351,8 +6366,10 @@ The QML modules QtPositioning and QtLocation could be missing!
OstcFirmwareCheck
-
- You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2
+
+ A firmware update for your dive computer is available: you have version %1 but the latest stable version is %2.
+Not using the latest available stable firmware version on your dive computer means that Subsurface may not work correctly with it.
@@ -6392,74 +6409,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
PlannerSettingsWidget
-
+
ft/min
-
+
Last stop at 20ft
-
+
50% avg. depth to 20ft
-
+
20ft to surface
-
+
ft
-
+
m/min
-
+
Last stop at 6m
-
+
50% avg. depth to 6m
-
+
6m to surface
-
+
m
-
+
cuft/min
-
+
ℓ/min
-
+
bar
-
+
psi
@@ -6467,7 +6484,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
PlannerWidgets
-
+
Print runtime table
@@ -7546,54 +7563,54 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString
Import
-
-
-
-
+
+
+
+
Read-only template
-
+
The template '%1' is read-only and cannot be edited.
Please export this template to a different file.
-
+
Import template file
-
-
+
+
HTML files
-
-
+
+
The destination template '%1' is read-only and cannot be overwritten.
-
+
Export template files as
-
+
This action cannot be undone!
-
+
Delete template '%1'?
-
+
The template '%1' is read-only and cannot be deleted.
@@ -7601,22 +7618,22 @@ Please export this template to a different file.
ProfileScene
-
+
Planned dive
-
+
Manually added dive
-
+
Unknown dive computer
-
+
(No.%1 of %2)
@@ -7718,128 +7735,128 @@ Please export this template to a different file.
ProfileWidget2
-
+
Show NDL / TTS was disabled because of excessive processing time
-
+
Make default dive computer
-
+
Delete this dive computer
-
+
Split this dive computer into own dive
-
+
Rename this dive computer
-
+
Edit gas change
-
+
Add gas change
-
+
Add setpoint change
-
+
Add bookmark
-
+
Split dive into two
-
+
Change dive mode
-
+
Remove event
-
+
Hide similar events
-
+
Edit name
-
-
+
+
Adjust pressure of cyl. %1 (currently interpolated as %2)
-
+
Unhide all events
-
+
Edit nickname
-
+
Set new nickname for %1 (serial %2):
-
+
Hide events
-
+
Hide all %1 events?
-
+
Remove the selected event?
-
+
%1 @ %2:%3
-
+
Edit name of bookmark
-
+
Custom name:
-
+
Name is too long.
@@ -8052,13 +8069,13 @@ Please export this template to a different file.
-
+
Start processing
-
+
%1 dives processed
@@ -8068,7 +8085,7 @@ Please export this template to a different file.
no dives in period
-
+
Populate data model
@@ -8600,39 +8617,39 @@ Not all media files have timestamps in the range
Load media files even if the time does not match the dive time
-
+
Open image file
-
+
Image files
-
+
Selected dive date/time
-
+
First selected dive date/time
-
+
Last selected dive date/time
-
+
Files with inappropriate date/time
-
+
No Exif date/time found
@@ -9427,19 +9444,19 @@ Files with inappropriate date/time
Undo
-
+
Remove cylinder?
-
+
The deleted cylinder has sensor readings, which will be lost.
Do you want to continue?
-
+
Warning: edited %1 dives
@@ -10175,7 +10192,7 @@ mixed from Air and using:
TextHyperlinkEventFilter
-
+
%1click to visit %2
@@ -10183,7 +10200,7 @@ mixed from Air and using:
ToolTipItem
-
+
Information
@@ -10560,7 +10577,7 @@ Maximum
getextFromC
-
+
Error parsing the header
@@ -10591,7 +10608,7 @@ Maximum
-
+
deco stop
@@ -10599,7 +10616,7 @@ Maximum
-
+
ascent
@@ -10611,20 +10628,20 @@ Maximum
-
+
OLF
-
+
maxdepth
-
+
pO₂
@@ -10633,8 +10650,8 @@ Maximum
-
-
+
+
gas change
@@ -10642,20 +10659,20 @@ Maximum
-
+
rbt
-
+
ceiling
-
+
transmitter
@@ -10848,7 +10865,7 @@ Maximum
-
+
@@ -10895,10 +10912,10 @@ Maximum
%L1 dives
-
+
-
-
+
+
air
@@ -10907,7 +10924,7 @@ Maximum
-
+
h
@@ -10919,7 +10936,7 @@ Maximum
-
+
min
@@ -10960,8 +10977,8 @@ Maximum
-
-
+
+
oxygen
@@ -11446,210 +11463,210 @@ Maximum
O₂ calibration
-
+
none
-
+
workload
-
+
violation
-
+
bookmark
-
+
surface
-
+
safety stop
-
+
safety stop (recommended)
-
+
safety stop (mandatory)
-
+
deep stop
-
+
ceiling (safety stop)
-
+
event showing dive is below deco floor and adding deco time
below floor
-
+
divetime
-
+
airtime
-
+
rgbm
-
+
heading
-
+
tissue level warning
-
+
invalid event number
-
+
Error parsing the date/time
-
+
Dive %d: %s
-
+
Error parsing the divetime
-
+
Error parsing the maxdepth
-
+
Error parsing temperature
-
+
Error parsing the gas mix count
-
+
Error obtaining water salinity
-
+
Error obtaining surface pressure
-
+
Error obtaining dive mode
-
+
Error parsing the gas mix
-
+
Unable to create parser for %s %s
-
+
Error registering data
-
+
Error parsing the samples
-
+
Already downloaded dive at %s
-
+
Event: waiting for user action
-
+
read %dkb
-
+
model=%s firmware=%u serial=%u
-
+
Error registering the event handler.
-
+
Error registering the cancellation handler.
-
+
Dive data import error
-
+
Unable to create libdivecomputer context
-
+
Unable to open %s %s (%s)
-
+
Error opening the device %s %s (%s).
In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.
-
+
@@ -11658,7 +11675,7 @@ In most cases, in order to debug this issue, a libdivecomputer logfile will be u
You can create this logfile by selecting the corresponding checkbox in the download dialog.
-
+
No new dives downloaded from dive computer
@@ -11717,12 +11734,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl
Can't open stylesheet %s
-
+
Can't find gas %s
-
+
ean
@@ -11756,9 +11773,9 @@ You can create this logfile by selecting the corresponding checkbox in the downl
-
-
-
+
+
+
bar
@@ -12016,7 +12033,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl
planned waypoint above ceiling
-
+
@@ -12025,77 +12042,77 @@ D: %.1f%s
-
+
P: %d%s (%s)
-
+
T: %.1f%s
-
+
V: %.1f%s
-
+
SAC: %.*f%s/min
-
+
CNS: %u%%
-
+
pO₂: %.2fbar
-
+
SCR ΔpO₂: %.2fbar
-
+
pN₂: %.2fbar
-
+
pHe: %.2fbar
-
+
MOD: %d%s
-
+
@@ -12104,7 +12121,7 @@ EADD: %d%s / %.1fg/ℓ
-
+
@@ -12113,397 +12130,397 @@ EADD: %d%s / %.1fg/ℓ
-
+
Density: %.1fg/ℓ
-
+
Safety stop: %umin @ %.0f%s
-
+
Safety stop: unknown time @ %.0f%s
-
+
Deco: %umin @ %.0f%s
-
+
Deco: unknown time @ %.0f%s
-
+
In deco
-
+
NDL: %umin
-
+
TTS: %umin
-
+
Deco: %umin @ %.0f%s (calc)
-
+
In deco (calc)
-
+
NDL: %umin (calc)
-
+
NDL: >2h (calc)
-
+
TTS: %umin (calc)
-
+
TTS: >2h (calc)
-
+
RBT: %umin
-
+
GF %d%%
-
+
Surface GF %.0f%%
-
+
Calculated ceiling %.1f%s
-
+
Tissue %.0fmin: %.1f%s
-
+
ICD in leading tissue
-
+
heart rate: %d
-
+
bearing: %d
-
+
mean depth to here %.1f%s
-
+
ΔT:%d:%02dmin
-
+
%s ΔD:%.1f%s
-
+
%s ↓D:%.1f%s
-
+
%s ↑D:%.1f%s
-
+
%s øD:%.1f%s
-
+
%s ↓V:%.2f%s
-
+
%s ↑V:%.2f%s
-
+
%s øV:%.2f%s
-
+
%s ΔP:%d%s
-
+
%s SAC:%.*f%s/min
-
+
%1km
-
+
%1m
-
+
%1mi
-
+
%1yd
-
-
+
+
N
-
-
+
+
S
-
-
+
+
E
-
-
+
+
W
-
-
-
-
+
+
+
+
m
-
-
-
-
+
+
+
+
ft
-
-
-
-
+
+
+
+
-
+
kg
-
-
-
-
+
+
+
+
-
+
lbs
-
-
+
+
C
-
-
+
+
F
-
+
ℓ
-
-
+
+
cuft
-
-
-
+
+
+
psi
-
+
g/ℓ
-
+
Fresh
-
+
Brackish
-
+
EN13319
-
+
Salt
-
+
Use DC
-
-
+
+
AIR
-
+
EAN
-
+
more than %1 days
-
-
+
+
no dives
-
+
OXYGEN
-
+
cyl.
-
+
ℓ
@@ -13367,12 +13384,12 @@ Is the Uemis Zurich plugged in correctly?
Remove this point
-
+
Cyl
-
+
/min