summaryrefslogtreecommitdiffstats
path: root/translations/subsurface_vi.ts
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2016-12-12 09:25:32 +0900
committerGravatar Dirk Hohndel <dirk@hohndel.org>2016-12-12 09:25:32 +0900
commitc7cadab27cd09392d60763178276647c923d752c (patch)
tree733e82067ae4162a942837a7615991dcfb4acd10 /translations/subsurface_vi.ts
parentb01722e8154626d44dc8425d35e7b8245c9ac11c (diff)
downloadsubsurface-c7cadab27cd09392d60763178276647c923d752c.tar.gz
Latest translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations/subsurface_vi.ts')
-rw-r--r--translations/subsurface_vi.ts6291
1 files changed, 3180 insertions, 3111 deletions
diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts
index 243e6f53b..828bcef51 100644
--- a/translations/subsurface_vi.ts
+++ b/translations/subsurface_vi.ts
@@ -105,6 +105,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+ <source>Could not initialize Winsock version 2.2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
<source>Trying to turn on the local Bluetooth device...</source>
<translation type="unfinished"/>
@@ -115,6 +120,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+ <source>Remote devices list was cleared.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
<source>Scanning for remote devices...</source>
<translation type="unfinished"/>
@@ -125,6 +135,22 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+ <source>The local Bluetooth device was %1.</source>
+ <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+ <source>turned on</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+ <source>turned off</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
- <source>Device %1 was paired and is authorized.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
- <source>Could not initialize Winsock version 2.2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
- <source>Remote devices list was cleared.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
- <source>The local Bluetooth device was %1.</source>
- <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
- <source>turned on</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
- <source>turned off</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
<source>Remove pairing</source>
<translation type="unfinished"/>
@@ -228,6 +223,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+ <source>Device %1 was paired and is authorized.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
<source>The device %1 can now be used for connection. You can press the Save button.</source>
<translation type="unfinished"/>
@@ -286,12 +286,12 @@
<context>
<name>BuddyFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
<source>Person: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
<source>Searches for buddies and divemasters</source>
<translation type="unfinished"/>
</message>
@@ -299,7 +299,7 @@
<context>
<name>BuddyFilterModel</name>
<message>
- <location filename="../qt-models/filtermodels.cpp" line="243"/>
+ <location filename="../qt-models/filtermodels.cpp" line="248"/>
<source>No buddies</source>
<translation type="unfinished"/>
</message>
@@ -307,25 +307,30 @@
<context>
<name>CloudCredentials</name>
<message>
- <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+ <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
<source>Cloud credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+ <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
<source>Email</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+ <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
<source>Password</source>
<translation>Mật khẩu</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+ <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
<source>Show password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+ <source>PIN</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
</message>
<message>
<location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+ <source>Max. depth</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+ <source>Avg. depth</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
<source>Divemaster</source>
<translation>Người lặn giỏi nhất</translation>
</message>
@@ -391,6 +406,11 @@
</message>
<message>
<location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+ <source>Suit</source>
+ <translation>Đồ lặn</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
<source>Notes</source>
<translation>Ghi chú</translation>
</message>
@@ -410,21 +430,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
- <source>Max. depth</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
- <source>Avg. depth</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
- <source>Suit</source>
- <translation>Đồ lặn</translation>
- </message>
- <message>
<location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
<source>O₂</source>
<translation type="unfinished"/>
@@ -538,7 +543,7 @@
<translation>Không thể tạo nội dung cho thiết bị đo lặn</translation>
</message>
<message>
- <location filename="../core/configuredivecomputer.cpp" line="660"/>
+ <location filename="../core/configuredivecomputer.cpp" line="656"/>
<source>Could not a establish connection to the dive computer.</source>
<translation type="unfinished"/>
</message>
@@ -558,25 +563,45 @@
<translation>Thiết bị hoặc điểm kết nối</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
- <source>...</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+ <source>Connect via Bluetooth</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+ <source>Connect</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+ <source>Disconnect</source>
+ <translation>Ngắt kết nối</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1521"/>
<source>Retrieve available details</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+ <source>Read settings from backup file or from device before writing to the device</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
<source>Save changes to device</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+ <source>Read settings from backup file or from device before writing to a backup file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
<source>Backup</source>
@@ -595,14 +620,39 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+ <source>Save libdivecomputer logfile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+ <source>...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
- <source>OSTC 3</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+ <source>OSTC 3,Sport,Cr,2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+ <source>Suunto Vyper family</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+ <source>OSTC, Mk.2/2N/2C</source>
<translation type="unfinished"/>
</message>
<message>
@@ -616,39 +666,55 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
- <source>Serial No.</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+ <source>Eco</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
- <source>Firmware version</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+ <source>Medium</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
- <source>Custom text</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+ <source>High</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
- <source>Language</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+ <source>%</source>
<translation type="unfinished"/>
</message>
<message>
@@ -676,35 +742,59 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
- <source>Dive mode</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+ <source>m/°C</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
- <source>OC</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+ <source>ft/°F</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
- <source>CC</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+ <source>Serial No.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
- <source>Gauge</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+ <source>Firmware version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
- <source>Apnea</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
+ <source>MMDDYY</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="365"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/>
+ <source>DDMMYY</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="370"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/>
+ <source>YYMMDD</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+ <source>Language</source>
<translation type="unfinished"/>
</message>
<message>
@@ -716,165 +806,154 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
- <source>MMDDYY</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+ <source>Brightness</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="365"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/>
- <source>DDMMYY</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+ <source>Units</source>
+ <translation>Đơn vị</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+ <source>Salinity (0-5%)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="370"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/>
- <source>YYMMDD</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+ <source>Reset device to default settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
- <source>Saturation</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+ <source>230LSB/Gauss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
- <source>%</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+ <source>330LSB/Gauss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
- <source>Desaturation</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+ <source>390LSB/Gauss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
- <source>Last deco</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+ <source>440LSB/Gauss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
- <source> m</source>
- <translation>m</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+ <source>660LSB/Gauss</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
- <source>Brightness</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+ <source>820LSB/Gauss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
- <source>Eco</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+ <source>1090LSB/Gauss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
- <source>Medium</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+ <source>1370LSB/Gauss</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
- <source>High</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+ <source>Compass gain</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
- <source>Sampling rate</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+ <source>Computer model</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
- <source>2s</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+ <source>Custom text</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="595"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1769"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/>
- <source>10s</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+ <source>OC</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
- <source>Units</source>
- <translation>Đơn vị</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+ <source>CC</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
- <source>m/°C</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+ <source>Gauge</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
- <source>ft/°F</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+ <source>Apnea</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
- <source>Dive mode color</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+ <source>Dive mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
+ <source>2s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="595"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1769"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/>
+ <source>10s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+ <source>Sampling rate</source>
<translation type="unfinished"/>
</message>
<message>
@@ -902,12 +981,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
- <source>Salinity (0-5%)</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,89 +989,79 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
- <source>Compass gain</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
- <source>Read settings from backup file or from device before writing to the device</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
- <source>Read settings from backup file or from device before writing to a backup file</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
- <source>OSTC, Mk.2/2N/2C</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+ <source>Dive mode color</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
- <source>230LSB/Gauss</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+ <source>Show safety stop</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
- <source>330LSB/Gauss</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+ <source>End Depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
- <source>390LSB/Gauss</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+ <source> s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
- <source>440LSB/Gauss</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+ <source>Length</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
- <source>660LSB/Gauss</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+ <source>Start Depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
- <source>820LSB/Gauss</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+ <source>Reset Depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
- <source>1090LSB/Gauss</source>
- <translation type="unfinished"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+ <source> m</source>
+ <translation>m</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
- <source>1370LSB/Gauss</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+ <source>Advanced settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
- <source>Show safety stop</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+ <source>Left button sensitivity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
- <source>Reset device to default settings</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+ <source>Always show ppO2</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1010,20 +1073,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
- <source>Suunto Vyper family</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
- <source>Advanced settings</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+ <source>Desaturation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
- <source> min</source>
- <translation>nhỏ nhất</translation>
- </message>
- <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,60 +1133,25 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
- <source>Connect via Bluetooth</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
- <source>Save libdivecomputer logfile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
- <source>End Depth</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
- <source> s</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
- <source>Length</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
- <source>Start Depth</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
- <source>Reset Depth</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
- <source>Left button sensitivity</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
+ <source>ZH-L16+GF</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
- <source>Always show ppO2</source>
- <translation type="unfinished"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+ <source> min</source>
+ <translation>nhỏ nhất</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
- <source>ZH-L16+GF</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+ <source>Last deco</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1157,6 +1171,14 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+ <source>Saturation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
<source>Flip screen</source>
@@ -1168,12 +1190,22 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+ <source>MOD warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
<source>Graphical speed indicator</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+ <source>Dynamic ascent rate</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
<source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+ <source> ℓ/min</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
<source>Temperature sensor offset</source>
<translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+ <source>%O₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,15 +1374,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
- <source>Set point [cbar]</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
- <source>Change depth [m]</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+ <source>Setpoint</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1370,6 +1416,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+ <source>O₂ in calibration gas</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
<source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
- <source>P1 (medium)</source>
- <extracomment>Suunto safety level</extracomment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
- <source>P2 (high)</source>
- <extracomment>Suunto safety level</extracomment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
- <source>Total dive time</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
- <source>kg/ℓ</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
- <source>Apnoea</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
- <source>Safety level</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
- <source>Connect</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
- <source>Disconnect</source>
- <translation>Ngắt kết nối</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
- <source>OSTC 3,Sport,Cr,2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
- <source>MOD warning</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
- <source>Dynamic ascent rate</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
- <source> ℓ/min</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
- <source>%O₂</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
- <source>Setpoint</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
- <source>O₂ in calibration gas</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+ <source>Safety level</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
<source>Altitude range</source>
@@ -1544,6 +1507,20 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+ <source>P1 (medium)</source>
+ <extracomment>Suunto safety level</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+ <source>P2 (high)</source>
+ <extracomment>Suunto safety level</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
<source>Sample rate</source>
@@ -1568,10 +1545,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
- <source>Computer model</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+ <source>Total dive time</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1637,12 +1613,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
- <source>Salinity</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
<source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+ <source>Salinity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+ <source>kg/ℓ</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
<source>ZH-L16 CC</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+ <source>Apnoea</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
<source>L16-GF OC</source>
@@ -1685,85 +1673,110 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
- <source>Backup files (*.xml)</source>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+ <source>OSTC 3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
- <source>An error occurred while saving the backup file.
-%1</source>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+ <source>Set point [cbar]</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
- <source>Backup succeeded</source>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+ <source>Change depth [m]</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
- <source>Your settings have been saved to: %1</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+ <source>Backup dive computer settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
- <source>Backup dive computer settings</source>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
+ <source>Backup files (*.xml)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
<source>XML backup error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+ <source>An error occurred while saving the backup file.
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
+ <source>Backup succeeded</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
+ <source>Your settings have been saved to: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
<source>Restore dive computer settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
<source>XML restore error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
<source>An error occurred while restoring the backup file.
%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
<source>Restore succeeded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
<source>Your settings have been restored successfully.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
<source>Select firmware file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
<source>All files (*.*)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
<source>Choose file for divecomputer download logfile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
<source>Log files (*.log)</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>ContextDrawer</name>
+ <message>
+ <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+ <source>Actions</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>CylindersModel</name>
<message>
<location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1777,11 +1790,6 @@
</message>
<message>
<location filename="../qt-models/cylindermodel.cpp" line="16"/>
- <source>He%</source>
- <translation>Anh ấy%</translation>
- </message>
- <message>
- <location filename="../qt-models/cylindermodel.cpp" line="16"/>
<source>Work press.</source>
<translation>Ấn làm việc.</translation>
</message>
@@ -1801,9 +1809,24 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+ <source>He%</source>
+ <translation>Anh ấy%</translation>
+ </message>
+ <message>
<location filename="../qt-models/cylindermodel.cpp" line="17"/>
- <source>Switch at</source>
- <translation>Chuyển đổi tại</translation>
+ <source>Deco switch at</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+ <source>Bot. MOD</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+ <source>MND</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1821,17 +1844,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+ <location filename="../qt-models/cylindermodel.cpp" line="177"/>
<source>Clicking here will remove this cylinder.</source>
<translation>Click vào đây sẽ loại bỏ này xi lanh.</translation>
</message>
<message>
- <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+ <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+ <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+ <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+ <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/cylindermodel.cpp" line="444"/>
<source>Cylinder cannot be removed</source>
<translation>Xi lanh không thể được gỡ bỏ</translation>
</message>
<message>
- <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+ <location filename="../qt-models/cylindermodel.cpp" line="445"/>
<source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
<translation>Khí này hiện đang được sử dụng. Chỉ các xi lanh không được sử dụng khi lặn có thể được gỡ bỏ.</translation>
</message>
@@ -1851,42 +1889,24 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+ <location filename="../build/ui_divecomponentselection.h" line="141"/>
+ <source>Dive site</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
<location filename="../build/ui_divecomponentselection.h" line="142"/>
<source>Suit</source>
<translation>Đồ lặn</translation>
</message>
<message>
- <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
- <location filename="../build/ui_divecomponentselection.h" line="148"/>
- <source>Divemaster</source>
- <translation>Người lặn giỏi nhất</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
- <location filename="../build/ui_divecomponentselection.h" line="149"/>
- <source>Buddy</source>
- <translation>Bạn</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
- <location filename="../build/ui_divecomponentselection.h" line="150"/>
- <source>Rating</source>
- <translation>Xếp hạng</translation>
- </message>
- <message>
<location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
<location filename="../build/ui_divecomponentselection.h" line="143"/>
<source>Visibility</source>
<translation>Tầm nhìn</translation>
</message>
<message>
- <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
- <location filename="../build/ui_divecomponentselection.h" line="141"/>
- <source>Dive site</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
<location filename="../build/ui_divecomponentselection.h" line="144"/>
<source>Notes</source>
@@ -1910,10 +1930,34 @@
<source>Cylinders</source>
<translation>Xilanh</translation>
</message>
+ <message>
+ <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+ <location filename="../build/ui_divecomponentselection.h" line="148"/>
+ <source>Divemaster</source>
+ <translation>Người lặn giỏi nhất</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+ <location filename="../build/ui_divecomponentselection.h" line="149"/>
+ <source>Buddy</source>
+ <translation>Bạn</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+ <location filename="../build/ui_divecomponentselection.h" line="150"/>
+ <source>Rating</source>
+ <translation>Xếp hạng</translation>
+ </message>
</context>
<context>
<name>DiveComputerManagementDialog</name>
<message>
+ <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+ <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+ <source>Edit dive computer nicknames</source>
+ <translation>Chỉnh sửa tên thiết bị lặn</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
<source>Remove the selected dive computer?</source>
<translation>Loại bỏ các Máy Lặn đã chọn?</translation>
@@ -1925,12 +1969,6 @@
<translation>Bạn có chắc bạn muốn
bỏ các máy lặn đã được chọn?</translation>
</message>
- <message>
- <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
- <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
- <source>Edit dive computer nicknames</source>
- <translation>Chỉnh sửa tên thiết bị lặn</translation>
- </message>
</context>
<context>
<name>DiveComputerModel</name>
@@ -1958,17 +1996,17 @@ bỏ các máy lặn đã được chọn?</translation>
<context>
<name>DiveDetails</name>
<message>
- <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+ <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
<source>Dive details</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+ <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
<source>Delete dive</source>
<translation>Xóa lần lặn</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+ <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
<source>Show on map</source>
<translation type="unfinished"/>
</message>
@@ -1976,88 +2014,93 @@ bỏ các máy lặn đã được chọn?</translation>
<context>
<name>DiveDetailsEdit</name>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
<source>Dive %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
<source>Date:</source>
<translation>Ngày tháng:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
<source>Location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
<source>Coordinates:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
<source>Use current
GPS location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
<source>Depth:</source>
<translation>Độ sâu:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
<source>Duration:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
<source>Air Temp:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
<source>Water Temp:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
<source>Suit:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
<source>Buddy:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
<source>Dive Master:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
<source>Weight:</source>
<translation>Cân nặng:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+ <source>Cylinder:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
<source>Gas mix:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
<source>Start Pressure:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
<source>End Pressure:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
<source>Notes:</source>
<translation type="unfinished"/>
</message>
@@ -2095,42 +2138,42 @@ GPS location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
<source>Air Temp:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
<source>Cylinder:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
<source>Water Temp:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
<source>Dive Master:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
<source>Weight:</source>
<translation>Cân nặng:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
<source>Buddy:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
<source>SAC:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
<source>Notes</source>
<translation>Ghi chú</translation>
</message>
@@ -2138,18 +2181,18 @@ GPS location:</source>
<context>
<name>DiveEventItem</name>
<message>
- <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+ <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
<source>Manual switch to OC</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+ <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
<source> begin</source>
<comment>Starts with space!</comment>
<translation>bắt đầu</translation>
</message>
<message>
- <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+ <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
<source> end</source>
<comment>Starts with space!</comment>
<translation>kết thúc</translation>
@@ -2158,27 +2201,27 @@ GPS location:</source>
<context>
<name>DiveImportedModel</name>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
<source>Date/time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
<source>Duration</source>
<translation>Độ dài</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
<source>Depth</source>
<translation>Độ sâu</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
<source>h:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
<source>min</source>
<translation>nhỏ nhất</translation>
</message>
@@ -2187,8 +2230,8 @@ GPS location:</source>
<name>DiveList</name>
<message>
<location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
- <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
- <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+ <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+ <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
<source>Dive list</source>
<translation type="unfinished"/>
</message>
@@ -2203,110 +2246,115 @@ GPS location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+ <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
<source>Cloud credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+ <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
<source>Please tap the &apos;+&apos; button to add a dive</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+ <source>No dives in dive list</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>DiveListView</name>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
<source>Expand all</source>
<translation>Mở rộng tất cả</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
<source>Collapse all</source>
<translation>Mở ra tất cả</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
<source>Collapse others</source>
<translation>Mở ra tất cả</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
<source>Remove dive(s) from trip</source>
<translation>Loại bỏ (các)máy lặn từ chuyến đi</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
<source>Create new trip above</source>
<translation>Tạo một chuyến đi mới phía trước</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
<source>Add dive(s) to trip immediately above</source>
<translation>Thêm (các)chuyến đi lặn ngay lập tức ở trên</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
<source>Add dive(s) to trip immediately below</source>
<translation>Thêm (các)chuyến đi lặn ngay lập tức ở dưới</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
<source>Merge trip with trip above</source>
<translation>Gập chuyến đi với chuyến đi trước</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
<source>Merge trip with trip below</source>
<translation>Gộp chuyến đi với chuyến đi bên dưới</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
<source>Delete dive(s)</source>
<translation>Xóa (các)lần lặn</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
<source>Mark dive(s) invalid</source>
<translation>Đánh dấu (các)lần lặn không hợp lệ</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
<source>Merge selected dives</source>
<translation>Hợp nhất các lần lặn được chọn</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
<source>Renumber dive(s)</source>
<translation>Đánh dấu lại (các)lần lặn</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
<source>Shift dive times</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
<source>Split selected dives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
<source>Load image(s) from file(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
<source>Load image(s) from web</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
<source>Open image files</source>
<translation>Mở tập tin hình ảnh</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
<source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
<translation>Tập tin hình ảnh (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
</message>
@@ -2327,56 +2375,6 @@ GPS location:</source>
<context>
<name>DiveLogExportDialog</name>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
- <location filename="../build/ui_divelogexportdialog.h" line="351"/>
- <source>Export format</source>
- <translation>Định dạng của dữ liệu xuất</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
- <location filename="../build/ui_divelogexportdialog.h" line="353"/>
- <source>UDDF</source>
- <translation>UDDF</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
- <location filename="../build/ui_divelogexportdialog.h" line="358"/>
- <source>Worldmap</source>
- <translation>Bản đồ thế giới</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
- <location filename="../build/ui_divelogexportdialog.h" line="359"/>
- <source>I&amp;mage depths</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
- <location filename="../build/ui_divelogexportdialog.h" line="360"/>
- <source>Selection</source>
- <translation>Lựa chọn</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
- <location filename="../build/ui_divelogexportdialog.h" line="361"/>
- <location filename="../build/ui_divelogexportdialog.h" line="372"/>
- <source>Selected dives</source>
- <translation>Các lần lặn đã được chọn</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
- <location filename="../build/ui_divelogexportdialog.h" line="362"/>
- <source>All dives</source>
- <translation>Tất cả các lần lặn</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
- <location filename="../build/ui_divelogexportdialog.h" line="396"/>
- <source>HTML</source>
- <translation>HTML</translation>
- </message>
- <message>
<location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
<location filename="../build/ui_divelogexportdialog.h" line="349"/>
<source>Export dive log files</source>
@@ -2389,12 +2387,24 @@ GPS location:</source>
<translation>Chỉnh sửa chung cho xuất dữ liệu</translation>
</message>
<message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+ <source>Export format</source>
+ <translation>Định dạng của dữ liệu xuất</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
<location filename="../build/ui_divelogexportdialog.h" line="352"/>
<source>Subsurface &amp;XML</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+ <source>UDDF</source>
+ <translation>UDDF</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
<location filename="../build/ui_divelogexportdialog.h" line="354"/>
<source>di&amp;velogs.de</source>
@@ -2419,238 +2429,297 @@ GPS location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+ <source>Worldmap</source>
+ <translation>Bản đồ thế giới</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+ <source>TeX</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+ <source>I&amp;mage depths</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+ <source>Selection</source>
+ <translation>Lựa chọn</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+ <source>Selected dives</source>
+ <translation>Các lần lặn đã được chọn</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+ <source>All dives</source>
+ <translation>Tất cả các lần lặn</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
<location filename="../build/ui_divelogexportdialog.h" line="363"/>
<source>CSV units</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
<location filename="../build/ui_divelogexportdialog.h" line="366"/>
<source>Metric</source>
<translation>Số liệu</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
<location filename="../build/ui_divelogexportdialog.h" line="367"/>
<source>Imperial</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+ <source>HTML</source>
+ <translation>HTML</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
<location filename="../build/ui_divelogexportdialog.h" line="370"/>
<source>General settings</source>
<translation>Cài đặt chung</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
<location filename="../build/ui_divelogexportdialog.h" line="371"/>
<source>Subsurface numbers</source>
<translation>Số hiệu Subsurface</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
<location filename="../build/ui_divelogexportdialog.h" line="373"/>
<source>Export yearly statistics</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
<location filename="../build/ui_divelogexportdialog.h" line="374"/>
<source>All di&amp;ves</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
<location filename="../build/ui_divelogexportdialog.h" line="375"/>
<source>Export list only</source>
<translation>Chỉ danh sách xuất dữ liệu</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
<location filename="../build/ui_divelogexportdialog.h" line="376"/>
<source>Export photos</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
<location filename="../build/ui_divelogexportdialog.h" line="377"/>
<source>Style options</source>
<translation>Chỉnh phần trang trí</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
<location filename="../build/ui_divelogexportdialog.h" line="378"/>
<source>Font</source>
<translation>Kiểu chữ</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
<location filename="../build/ui_divelogexportdialog.h" line="379"/>
<source>Font size</source>
<translation>Kích thước kiểu chữ</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
<location filename="../build/ui_divelogexportdialog.h" line="382"/>
<source>8</source>
<translation>8</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
<location filename="../build/ui_divelogexportdialog.h" line="383"/>
<source>10</source>
<translation>10</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
<location filename="../build/ui_divelogexportdialog.h" line="384"/>
<source>12</source>
<translation>12</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
<location filename="../build/ui_divelogexportdialog.h" line="385"/>
<source>14</source>
<translation>14</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
<location filename="../build/ui_divelogexportdialog.h" line="386"/>
<source>16</source>
<translation>16</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
<location filename="../build/ui_divelogexportdialog.h" line="387"/>
<source>18</source>
<translation>18</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
<location filename="../build/ui_divelogexportdialog.h" line="388"/>
<source>20</source>
<translation>20</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
<location filename="../build/ui_divelogexportdialog.h" line="390"/>
<source>Theme</source>
<translation>Giao diện</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
<location filename="../build/ui_divelogexportdialog.h" line="393"/>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
<source>Light</source>
<translation>Sáng</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
<location filename="../build/ui_divelogexportdialog.h" line="394"/>
<source>Sand</source>
<translation>Cát</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
- <source>UDDF files (*.uddf *.UDDF)</source>
- <translation>UDDF files (*.uddf *.UDDF)</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
- <source>CSV files (*.csv *.CSV)</source>
- <translation>CSV files (*.csv *.CSV)</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
<source>Generic format that is used for data exchange between a variety of diving related programs.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
<source>Comma separated values describing the dive profile.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
<source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
<source>Send the dive data to divelogs.de website.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
<source>Send the dive data to dive-share.appspot.com website</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
<source>HTML export of the dive locations, visualized on a world map.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
<source>Subsurface native XML format.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
<source>Write depths of images to file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
- <source>Export UDDF file as</source>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+ <source>Write dive as TeX macros to file.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+ <source>Export UDDF file as</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+ <source>UDDF files (*.uddf *.UDDF)</source>
+ <translation>UDDF files (*.uddf *.UDDF)</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
<source>Export CSV file as</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+ <source>CSV files (*.csv *.CSV)</source>
+ <translation>CSV files (*.csv *.CSV)</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
<source>Export world map</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
<source>HTML files (*.html)</source>
<translation>HTML files (*.html)</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
<source>Export Subsurface XML</source>
<translation>Xuất dữ liệu dưới dạng Subsurface XML</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
<source>XML files (*.xml *.ssrf)</source>
<translation>XML files (*.xml *.ssrf)</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
<source>Save image depths</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+ <source>Export to TeX file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+ <source>TeX files (*.tex)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
<source>Export HTML files as</source>
<translation>Xuất dữ liệu từ tập tin HTML dưới dạng</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
<source>Please wait, exporting...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
<source>Can&apos;t open file %s</source>
<translation type="unfinished"/>
</message>
@@ -2664,25 +2733,6 @@ GPS location:</source>
<translation>Nhập dữ liệu từ tập tin ghi nhận các lần lặn</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
- <source>Time</source>
- <translation>Thời gian</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
- <location filename="../build/ui_divelogimportdialog.h" line="164"/>
- <source>Metric</source>
- <translation>Số liệu</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
- <location filename="../build/ui_divelogimportdialog.h" line="165"/>
- <source>Imperial</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
<location filename="../build/ui_divelogimportdialog.h" line="152"/>
<source>dd.mm.yyyy</source>
@@ -2701,269 +2751,287 @@ GPS location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
- <location filename="../build/ui_divelogimportdialog.h" line="167"/>
- <source>Drag the tags above to each corresponding column below</source>
+ <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
+ <location filename="../build/ui_divelogimportdialog.h" line="158"/>
+ <source>Seconds</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
- <source>Dive #</source>
+ <location filename="../desktop-widgets/divelogimportdialog.ui" line="113"/>
+ <location filename="../build/ui_divelogimportdialog.h" line="159"/>
+ <source>Minutes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
- <source>Date</source>
- <translation>Ngày tháng</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.ui" line="118"/>
+ <location filename="../build/ui_divelogimportdialog.h" line="160"/>
+ <source>Minutes:seconds</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
- <source>Duration</source>
- <translation>Độ dài</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+ <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+ <source>Metric</source>
+ <translation>Số liệu</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
- <source>GPS</source>
+ <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+ <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+ <source>Imperial</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
- <source>Max. depth</source>
+ <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+ <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+ <source>Drag the tags above to each corresponding column below</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
- <source>Avg. depth</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
+ <source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
- <source>Suit</source>
- <translation>Đồ lặn</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
+ <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
- <source>Tags</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
+ <source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
- <source>O₂</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
+ <source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
- <source>He</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
+ <source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
- <location filename="../build/ui_divelogimportdialog.h" line="158"/>
- <source>Seconds</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.ui" line="113"/>
- <location filename="../build/ui_divelogimportdialog.h" line="159"/>
- <source>Minutes</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
+ <source>Sample sensor1 pO₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.ui" line="118"/>
- <location filename="../build/ui_divelogimportdialog.h" line="160"/>
- <source>Minutes:seconds</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
+ <source>Sample sensor2 pO₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
- <source>Location</source>
- <translation>Địa điểm</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
+ <source>Sample sensor3 pO₂</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
- <source>Tab</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
- <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
- <source>Sample time</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
- <source>Sample depth</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+ <source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
- <source>Sample temperature</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
+ <source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
- <source>Sample sensor1 pO₂</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+ <source>Sample setpoint</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
- <source>Sample sensor2 pO₂</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+ <source>Dive #</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
- <source>Sample sensor3 pO₂</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+ <source>Date</source>
+ <translation>Ngày tháng</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+ <source>Time</source>
+ <translation>Thời gian</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+ <source>Duration</source>
+ <translation>Độ dài</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+ <source>Max. depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
- <source>Sample stopdepth</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+ <source>Avg. depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
- <source>Sample setpoint</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+ <source>Air temp.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
- <source>Sample pO₂</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+ <source>Water temp.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
- <source>Sample CNS</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
+ <source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
- <source>Sample NDL</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
+ <source>Start pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
- <source>Sample TTS</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
+ <source>End pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
- <source>Sample pressure</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+ <source>O₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+ <source>He</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+ <source>Location</source>
+ <translation>Địa điểm</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+ <source>GPS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
<source>Divemaster</source>
<translation>Người lặn giỏi nhất</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
<source>Buddy</source>
<translation>Bạn</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+ <source>Suit</source>
+ <translation>Đồ lặn</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
<source>Rating</source>
<translation>Xếp hạng</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
<source>Visibility</source>
<translation>Tầm nhìn</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
<source>Notes</source>
<translation>Ghi chú</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
<source>Weight</source>
<translation>Cân nặng</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
- <source>Cyl. size</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
- <source>Start pressure</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
- <source>End pressure</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
- <source>Air temp.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
- <source>Water temp.</source>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+ <source>Tags</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>DiveObjectHelper</name>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+ <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
<source>%1 dive(s)</source>
<translation type="unfinished"/>
</message>
@@ -2971,18 +3039,18 @@ GPS location:</source>
<context>
<name>DivePlanner</name>
<message>
- <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
- <location filename="../build/ui_diveplanner.h" line="190"/>
- <source>Altitude</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../desktop-widgets/diveplanner.ui" line="109"/>
<location filename="../build/ui_diveplanner.h" line="189"/>
<source>Planned dive time</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+ <location filename="../build/ui_diveplanner.h" line="190"/>
+ <source>Altitude</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/diveplanner.ui" line="159"/>
<location filename="../build/ui_diveplanner.h" line="191"/>
<source>ATM pressure</source>
@@ -3016,32 +3084,32 @@ GPS location:</source>
<context>
<name>DivePlannerPointsModel</name>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
<source>unknown</source>
<translation>chưa rõ</translation>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
<source>Final depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
<source>Run time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
<source>Duration</source>
<translation>Độ dài</translation>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
<source>Used gas</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
<source>CC setpoint</source>
<translation type="unfinished"/>
</message>
@@ -3049,22 +3117,22 @@ GPS location:</source>
<context>
<name>DivePlannerWidget</name>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
<source>Dive planner points</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
<source>Available gases</source>
<translation>Dưỡng khí hiện có</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
<source>Add dive data point</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
<source>Save new</source>
<translation type="unfinished"/>
</message>
@@ -3097,11 +3165,36 @@ GPS location:</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+ <source>User entered</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+ <source>Cylinder index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
<source>Pressure S</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+ <source>Pressure I</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+ <source>Ceiling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+ <source>SAC</source>
+ <translation>SAC</translation>
+ </message>
+ <message>
<location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
<source>pN₂</source>
<translation type="unfinished"/>
@@ -3137,50 +3230,25 @@ GPS location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
- <source>Heart rate</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
- <source>Mean depth @ s</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
<source>Ambient pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
- <source>Gradient factor</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
- <source>Pressure I</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
- <source>User entered</source>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+ <source>Heart rate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
- <source>Cylinder index</source>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
+ <source>Gradient factor</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
- <source>Ceiling</source>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+ <source>Mean depth @ s</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
- <source>SAC</source>
- <translation>SAC</translation>
- </message>
</context>
<context>
<name>DiveShareExportDialog</name>
@@ -3246,309 +3314,313 @@ p, li { white-space: pre-wrap; }
<context>
<name>DiveTripModel</name>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="395"/>
- <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="483"/>
<source>#</source>
<translation>#</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="398"/>
- <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="486"/>
<source>Date</source>
<translation>Ngày tháng</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="401"/>
- <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="489"/>
<source>Rating</source>
<translation>Xếp hạng</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="443"/>
<source>Depth</source>
<translation>Độ sâu</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+ <source>Duration</source>
+ <translation>Độ dài</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="449"/>
<source>Temp</source>
<translation>Nhiệt độ</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="452"/>
<source>Weight</source>
<translation>Cân nặng</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="425"/>
- <source>SAC</source>
- <translation>SAC</translation>
- </message>
- <message>
- <location filename="../qt-models/divetripmodel.cpp" line="450"/>
- <source>m</source>
- <translation>m</translation>
- </message>
- <message>
- <location filename="../qt-models/divetripmodel.cpp" line="450"/>
- <source>ft</source>
- <translation>ft</translation>
- </message>
- <message>
- <location filename="../qt-models/divetripmodel.cpp" line="459"/>
- <source>Weight(%1)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-models/divetripmodel.cpp" line="416"/>
- <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="504"/>
<source>Suit</source>
<translation>Đồ lặn</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="419"/>
- <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="507"/>
<source>Cyl</source>
<translation>Xlanh</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="422"/>
- <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="510"/>
<source>Gas</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="473"/>
- <source>SAC(%1)</source>
- <translation type="unfinished"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+ <source>SAC</source>
+ <translation>SAC</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="473"/>
- <source>/min</source>
- <translation>/nhỏ nhất</translation>
+ <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+ <source>OTU</source>
+ <translation>OTU</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="431"/>
- <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="521"/>
<source>Max CNS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="434"/>
- <location filename="../qt-models/divetripmodel.cpp" line="482"/>
- <source>Location</source>
- <translation>Địa điểm</translation>
+ <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+ <source>Photos</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="459"/>
- <source>kg</source>
- <translation>ký</translation>
+ <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+ <source>Location</source>
+ <translation>Địa điểm</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="492"/>
<source>Depth(%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="407"/>
- <location filename="../qt-models/divetripmodel.cpp" line="453"/>
- <source>Duration</source>
- <translation>Độ dài</translation>
+ <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+ <source>m</source>
+ <translation>m</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+ <source>ft</source>
+ <translation>ft</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="498"/>
<source>Temp(%1%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+ <source>Weight(%1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+ <source>kg</source>
+ <translation>ký</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="501"/>
<source>lbs</source>
<translation>lbs</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="428"/>
- <location filename="../qt-models/divetripmodel.cpp" line="476"/>
- <source>OTU</source>
- <translation>OTU</translation>
+ <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+ <source>SAC(%1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+ <source>/min</source>
+ <translation>/nhỏ nhất</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+ <source>Photos before/during/after dive</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>DivelogsDeWebServices</name>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
<source>no dives were selected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
<source>stylesheet to export to divelogs.de is not found</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
<source>failed to create zip file for upload: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
<source>internal error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
<source>Conversion of dive %1 to divelogs.de format failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
<source>error writing zip file: %s zip error %d system error %d - %s</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
<source>Done</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
<source>Uploading dive list...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
<source>Downloading dive list...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
<source>Downloading %1 dives...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
<source>Download finished - %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
<source>Problem with download</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
<source>The archive could not be opened:
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
<source>Corrupted download</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
<source>The archive could not be opened:
%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+ <source>Upload finished</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
<source>Upload failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
<source>Upload successful</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
<source>Login failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
<source>Cannot parse response</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
<source>Error: %1</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
- <source>Upload finished</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>DownloadFromDCWidget</name>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
- <source>Error</source>
- <translation>Lỗi</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
- <source>Retry</source>
- <translation>Thử lại</translation>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
+ <source>Download</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
- <source>Find Uemis dive computer</source>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
+ <source>Choose Bluetooth download mode</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
- <source>Download</source>
- <translation type="unfinished"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+ <source>Error</source>
+ <translation>Lỗi</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
- <source>Choose Bluetooth download mode</source>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+ <source>Find Uemis dive computer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
<source>Choose file for divecomputer download logfile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
<source>Log files (*.log)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
<source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
<source>Choose file for divecomputer binary dump file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
<source>Dump files (*.bin)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+ <source>Retry</source>
+ <translation>Thử lại</translation>
+ </message>
</context>
<context>
<name>DownloadFromDiveComputer</name>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
- <source>Vendor</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
<location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
<source>Download from dive computer</source>
@@ -3561,17 +3633,6 @@ p, li { white-space: pre-wrap; }
<translation>Thiết bị hoặc điểm kết nối</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
- <source>Choose Bluetooth download mode</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
- <source>Dive computer</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3595,27 +3656,50 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+ <source>Download into new trip</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+ <source>Save libdivecomputer logfile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+ <source>Save libdivecomputer dumpfile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+ <source>Choose Bluetooth download mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
<source>Select a remote Bluetooth device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
- <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
- <source>Download</source>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+ <source>Vendor</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
- <source>OK</source>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+ <source>Dive computer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
- <source>Cancel</source>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
+ <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
+ <source>Download</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3637,21 +3721,15 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
- <source>Save libdivecomputer logfile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
- <source>Save libdivecomputer dumpfile</source>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+ <source>OK</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
- <source>Download into new trip</source>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+ <source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3742,12 +3820,12 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
<source>To disconnect Subsurface from your Facebook account, use the button below</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
<source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
<translation type="unfinished"/>
</message>
@@ -3755,22 +3833,22 @@ p, li { white-space: pre-wrap; }
<context>
<name>FacebookManager</name>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
<source>Photo upload sucessfull</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
<source>Your dive profile was updated to Facebook.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
<source>Photo upload failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
@@ -3830,17 +3908,25 @@ p, li { white-space: pre-wrap; }
<context>
<name>FirmwareUpdateThread</name>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
<source>This feature is not yet available for the selected dive computer.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
<source>Firmware update failed!</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>GlobalDrawer</name>
+ <message>
+ <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+ <source>Back</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>GlobeGPS</name>
<message>
<location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3856,27 +3942,27 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
<source>Date: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
<source>Name: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
<source>Latitude: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
<source>Longitude: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
<source>List of stored GPS fixes</source>
<translation type="unfinished"/>
</message>
@@ -3905,7 +3991,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>LocationFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
<source>Location: </source>
<translation type="unfinished"/>
</message>
@@ -3946,7 +4032,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>LocationFilterModel</name>
<message>
- <location filename="../qt-models/filtermodels.cpp" line="299"/>
+ <location filename="../qt-models/filtermodels.cpp" line="304"/>
<source>No location set</source>
<translation type="unfinished"/>
</message>
@@ -4067,20 +4153,55 @@ p, li { white-space: pre-wrap; }
</message>
</context>
<context>
- <name>MainForm.ui</name>
+ <name>MainTab</name>
+ <message>
+ <location filename="../desktop-widgets/maintab.ui" line="18"/>
+ <location filename="../desktop-widgets/maintab.ui" line="439"/>
+ <location filename="../build/ui_maintab.h" line="961"/>
+ <location filename="../build/ui_maintab.h" line="963"/>
+ <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+ <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+ <source>Notes</source>
+ <translation>Ghi chú</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/maintab.ui" line="21"/>
+ <location filename="../build/ui_maintab.h" line="964"/>
+ <source>General notes about the current selection</source>
+ <translation type="unfinished"/>
+ </message>
<message>
- <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
- <source>Press Me 1</source>
+ <location filename="../desktop-widgets/maintab.ui" line="92"/>
+ <location filename="../desktop-widgets/maintab.ui" line="646"/>
+ <location filename="../build/ui_maintab.h" line="947"/>
+ <location filename="../build/ui_maintab.h" line="967"/>
+ <source>Date</source>
+ <translation>Ngày tháng</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/maintab.ui" line="102"/>
+ <location filename="../build/ui_maintab.h" line="948"/>
+ <source>Time</source>
+ <translation>Thời gian</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/maintab.ui" line="112"/>
+ <location filename="../desktop-widgets/maintab.ui" line="836"/>
+ <location filename="../build/ui_maintab.h" line="949"/>
+ <location filename="../build/ui_maintab.h" line="987"/>
+ <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+ <source>Air temp.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
- <source>Press Me 2</source>
+ <location filename="../desktop-widgets/maintab.ui" line="122"/>
+ <location filename="../desktop-widgets/maintab.ui" line="855"/>
+ <location filename="../build/ui_maintab.h" line="950"/>
+ <location filename="../build/ui_maintab.h" line="989"/>
+ <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+ <source>Water temp.</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>MainTab</name>
<message>
<location filename="../desktop-widgets/maintab.ui" line="184"/>
<location filename="../build/ui_maintab.h" line="951"/>
@@ -4089,6 +4210,17 @@ p, li { white-space: pre-wrap; }
<translation>Địa điểm</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="214"/>
+ <source>Edit dive site</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/maintab.ui" line="217"/>
+ <location filename="../build/ui_maintab.h" line="953"/>
+ <source>...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="252"/>
<location filename="../build/ui_maintab.h" line="954"/>
<source>Divemaster</source>
@@ -4101,12 +4233,6 @@ p, li { white-space: pre-wrap; }
<translation>Bạn</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="387"/>
- <location filename="../build/ui_maintab.h" line="959"/>
- <source>Tags</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../desktop-widgets/maintab.ui" line="308"/>
<location filename="../build/ui_maintab.h" line="956"/>
<source>Rating</source>
@@ -4125,54 +4251,15 @@ p, li { white-space: pre-wrap; }
<translation>Đồ lặn</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="397"/>
- <location filename="../build/ui_maintab.h" line="960"/>
- <source>Dive mode</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="112"/>
- <location filename="../desktop-widgets/maintab.ui" line="836"/>
- <location filename="../build/ui_maintab.h" line="949"/>
- <location filename="../build/ui_maintab.h" line="987"/>
- <location filename="../desktop-widgets/maintab.cpp" line="306"/>
- <source>Air temp.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="122"/>
- <location filename="../desktop-widgets/maintab.ui" line="855"/>
- <location filename="../build/ui_maintab.h" line="950"/>
- <location filename="../build/ui_maintab.h" line="989"/>
- <location filename="../desktop-widgets/maintab.cpp" line="307"/>
- <source>Water temp.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="18"/>
- <location filename="../desktop-widgets/maintab.ui" line="439"/>
- <location filename="../build/ui_maintab.h" line="961"/>
- <location filename="../build/ui_maintab.h" line="963"/>
- <location filename="../desktop-widgets/maintab.cpp" line="539"/>
- <location filename="../desktop-widgets/maintab.cpp" line="571"/>
- <source>Notes</source>
- <translation>Ghi chú</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="21"/>
- <location filename="../build/ui_maintab.h" line="964"/>
- <source>General notes about the current selection</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="214"/>
- <source>Edit dive site</source>
+ <location filename="../desktop-widgets/maintab.ui" line="387"/>
+ <location filename="../build/ui_maintab.h" line="959"/>
+ <source>Tags</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="217"/>
- <location filename="../build/ui_maintab.h" line="953"/>
- <source>...</source>
+ <location filename="../desktop-widgets/maintab.ui" line="397"/>
+ <location filename="../build/ui_maintab.h" line="960"/>
+ <source>Dive mode</source>
<translation type="unfinished"/>
</message>
<message>
@@ -4200,6 +4287,12 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="665"/>
+ <location filename="../build/ui_maintab.h" line="969"/>
+ <source>Interval</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="684"/>
<location filename="../build/ui_maintab.h" line="971"/>
<source>Gases used</source>
@@ -4212,18 +4305,38 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="722"/>
+ <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+ <location filename="../build/ui_maintab.h" line="975"/>
+ <location filename="../build/ui_maintab.h" line="1003"/>
+ <source>SAC</source>
+ <translation>SAC</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="741"/>
<location filename="../build/ui_maintab.h" line="977"/>
<source>CNS</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="760"/>
+ <location filename="../build/ui_maintab.h" line="979"/>
+ <source>OTU</source>
+ <translation>OTU</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="779"/>
<location filename="../build/ui_maintab.h" line="981"/>
<source>Max. depth</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="798"/>
+ <location filename="../build/ui_maintab.h" line="983"/>
+ <source>Avg. depth</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="817"/>
<location filename="../build/ui_maintab.h" line="985"/>
<source>Air pressure</source>
@@ -4236,82 +4349,6 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="933"/>
- <location filename="../build/ui_maintab.h" line="1007"/>
- <source>Simple statistics about the selection</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="1039"/>
- <location filename="../build/ui_maintab.h" line="999"/>
- <source>Total time</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="1106"/>
- <location filename="../build/ui_maintab.h" line="1004"/>
- <source>Gas consumption</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="1151"/>
- <location filename="../build/ui_maintab.h" line="1009"/>
- <source>All photos from the current selection</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="1177"/>
- <location filename="../build/ui_maintab.h" line="1010"/>
- <source>Extra data</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="1180"/>
- <location filename="../build/ui_maintab.h" line="1011"/>
- <source>Adittional data from the dive computer</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="92"/>
- <location filename="../desktop-widgets/maintab.ui" line="646"/>
- <location filename="../build/ui_maintab.h" line="947"/>
- <location filename="../build/ui_maintab.h" line="967"/>
- <source>Date</source>
- <translation>Ngày tháng</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="102"/>
- <location filename="../build/ui_maintab.h" line="948"/>
- <source>Time</source>
- <translation>Thời gian</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="665"/>
- <location filename="../build/ui_maintab.h" line="969"/>
- <source>Interval</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="722"/>
- <location filename="../desktop-widgets/maintab.ui" line="1094"/>
- <location filename="../build/ui_maintab.h" line="975"/>
- <location filename="../build/ui_maintab.h" line="1003"/>
- <source>SAC</source>
- <translation>SAC</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="798"/>
- <location filename="../build/ui_maintab.h" line="983"/>
- <source>Avg. depth</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="760"/>
- <location filename="../build/ui_maintab.h" line="979"/>
- <source>OTU</source>
- <translation>OTU</translation>
- </message>
- <message>
<location filename="../desktop-widgets/maintab.ui" line="893"/>
<location filename="../build/ui_maintab.h" line="993"/>
<source>Salinity</source>
@@ -4324,22 +4361,34 @@ p, li { white-space: pre-wrap; }
<translation>Trạng thái</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="933"/>
+ <location filename="../build/ui_maintab.h" line="1007"/>
+ <source>Simple statistics about the selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="986"/>
<location filename="../build/ui_maintab.h" line="996"/>
<source>Depth</source>
<translation>Độ sâu</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="998"/>
+ <location filename="../build/ui_maintab.h" line="997"/>
+ <source>Duration</source>
+ <translation>Độ dài</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="1027"/>
<location filename="../build/ui_maintab.h" line="998"/>
<source>Temperature</source>
<translation>Nhiệt độ</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="998"/>
- <location filename="../build/ui_maintab.h" line="997"/>
- <source>Duration</source>
- <translation>Độ dài</translation>
+ <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+ <location filename="../build/ui_maintab.h" line="999"/>
+ <source>Total time</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4348,19 +4397,33 @@ p, li { white-space: pre-wrap; }
<translation>Lần lặn</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+ <location filename="../build/ui_maintab.h" line="1004"/>
+ <source>Gas consumption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="1148"/>
<location filename="../build/ui_maintab.h" line="1008"/>
<source>Photos</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="88"/>
- <source>Cylinders</source>
- <translation>Xilanh</translation>
+ <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+ <location filename="../build/ui_maintab.h" line="1009"/>
+ <source>All photos from the current selection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="92"/>
- <source>Weights</source>
+ <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+ <location filename="../build/ui_maintab.h" line="1010"/>
+ <source>Extra data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+ <location filename="../build/ui_maintab.h" line="1011"/>
+ <source>Adittional data from the dive computer</source>
<translation type="unfinished"/>
</message>
<message>
@@ -4374,11 +4437,21 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+ <source>Cylinders</source>
+ <translation>Xilanh</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.cpp" line="89"/>
<source>Add cylinder</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+ <source>Weights</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.cpp" line="93"/>
<source>Add weight system</source>
<translation type="unfinished"/>
@@ -4569,659 +4642,685 @@ mixed from Air and using:
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
- <location filename="../build/ui_mainwindow.h" line="534"/>
- <source>Export dive logs</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
- <location filename="../build/ui_mainwindow.h" line="542"/>
- <source>Toggle pHe graph</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
- <location filename="../build/ui_mainwindow.h" line="545"/>
- <source>Toggle calculating all tissues</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
- <location filename="../build/ui_mainwindow.h" line="543"/>
- <source>Toggle DC reported ceiling</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
- <location filename="../build/ui_mainwindow.h" line="544"/>
- <source>Toggle calculated ceiling</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
- <location filename="../build/ui_mainwindow.h" line="550"/>
- <source>Toggle NDL, TTS</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
- <location filename="../build/ui_mainwindow.h" line="546"/>
- <source>Toggle calculated ceiling with 3m increments</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
- <location filename="../build/ui_mainwindow.h" line="537"/>
- <source>Configure &amp;dive computer</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
- <location filename="../build/ui_mainwindow.h" line="547"/>
- <source>Toggle heart rate</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
- <location filename="../build/ui_mainwindow.h" line="548"/>
- <source>Toggle MOD</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
- <location filename="../build/ui_mainwindow.h" line="549"/>
- <source>Toggle EAD, END, EADD</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
- <location filename="../build/ui_mainwindow.h" line="551"/>
- <source>Toggle SAC rate</source>
- <translation>SAC</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
- <location filename="../build/ui_mainwindow.h" line="552"/>
- <source>Toggle ruler</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
<location filename="../build/ui_mainwindow.h" line="569"/>
<source>&amp;Log</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
<location filename="../build/ui_mainwindow.h" line="570"/>
<source>&amp;View</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
<location filename="../build/ui_mainwindow.h" line="571"/>
<source>&amp;Help</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
<location filename="../build/ui_mainwindow.h" line="572"/>
<source>&amp;Import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
<location filename="../build/ui_mainwindow.h" line="573"/>
<source>&amp;Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
<source>Share on</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
<location filename="../build/ui_mainwindow.h" line="453"/>
<source>&amp;New logbook</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
<location filename="../build/ui_mainwindow.h" line="455"/>
<source>New</source>
<translation>Mới</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
<location filename="../build/ui_mainwindow.h" line="457"/>
<source>Ctrl+N</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
<location filename="../build/ui_mainwindow.h" line="458"/>
<source>&amp;Open logbook</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
<location filename="../build/ui_mainwindow.h" line="460"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
<source>Open</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
<location filename="../build/ui_mainwindow.h" line="462"/>
<source>Ctrl+O</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
<location filename="../build/ui_mainwindow.h" line="463"/>
<source>&amp;Save</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
<location filename="../build/ui_mainwindow.h" line="465"/>
<source>Save</source>
<translation>Lưu lại</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
<location filename="../build/ui_mainwindow.h" line="467"/>
<source>Ctrl+S</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
<location filename="../build/ui_mainwindow.h" line="468"/>
<source>Sa&amp;ve as</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
<location filename="../build/ui_mainwindow.h" line="470"/>
<source>Save as</source>
<translation>Lưu dưới dạng</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
<location filename="../build/ui_mainwindow.h" line="472"/>
<source>Ctrl+Shift+S</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
<location filename="../build/ui_mainwindow.h" line="473"/>
<source>&amp;Close</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
<location filename="../build/ui_mainwindow.h" line="475"/>
<source>Close</source>
<translation>Đóng lại</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
<location filename="../build/ui_mainwindow.h" line="477"/>
<source>Ctrl+W</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+ <location filename="../build/ui_mainwindow.h" line="478"/>
+ <source>&amp;Print</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+ <location filename="../build/ui_mainwindow.h" line="479"/>
+ <source>Ctrl+P</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
<location filename="../build/ui_mainwindow.h" line="480"/>
<source>P&amp;references</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+ <location filename="../build/ui_mainwindow.h" line="481"/>
+ <source>Ctrl+,</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+ <location filename="../build/ui_mainwindow.h" line="482"/>
+ <source>&amp;Quit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+ <location filename="../build/ui_mainwindow.h" line="483"/>
+ <source>Ctrl+Q</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+ <location filename="../build/ui_mainwindow.h" line="484"/>
+ <source>Import from &amp;dive computer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+ <location filename="../build/ui_mainwindow.h" line="485"/>
+ <source>Ctrl+D</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
<location filename="../build/ui_mainwindow.h" line="486"/>
<source>Import &amp;GPS data from Subsurface web service</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+ <location filename="../build/ui_mainwindow.h" line="487"/>
+ <source>Ctrl+G</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
<location filename="../build/ui_mainwindow.h" line="488"/>
<source>Edit device &amp;names</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+ <location filename="../build/ui_mainwindow.h" line="489"/>
+ <source>&amp;Add dive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+ <location filename="../build/ui_mainwindow.h" line="490"/>
+ <source>Ctrl++</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
<location filename="../build/ui_mainwindow.h" line="491"/>
<source>&amp;Edit dive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
<location filename="../build/ui_mainwindow.h" line="492"/>
<source>&amp;Copy dive components</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
<location filename="../build/ui_mainwindow.h" line="493"/>
<source>Ctrl+C</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
<location filename="../build/ui_mainwindow.h" line="494"/>
<source>&amp;Paste dive components</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
<location filename="../build/ui_mainwindow.h" line="495"/>
<source>Ctrl+V</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+ <location filename="../build/ui_mainwindow.h" line="496"/>
+ <source>&amp;Renumber</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+ <location filename="../build/ui_mainwindow.h" line="497"/>
+ <source>Ctrl+R</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+ <location filename="../build/ui_mainwindow.h" line="498"/>
+ <source>Auto &amp;group</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+ <location filename="../build/ui_mainwindow.h" line="499"/>
+ <source>&amp;Yearly statistics</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+ <location filename="../build/ui_mainwindow.h" line="500"/>
+ <source>Ctrl+Y</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+ <location filename="../build/ui_mainwindow.h" line="501"/>
+ <source>&amp;Dive list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+ <location filename="../build/ui_mainwindow.h" line="502"/>
+ <source>Ctrl+2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
<location filename="../build/ui_mainwindow.h" line="503"/>
<source>&amp;Profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+ <location filename="../build/ui_mainwindow.h" line="504"/>
+ <source>Ctrl+3</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
<location filename="../build/ui_mainwindow.h" line="505"/>
<source>&amp;Info</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
- <location filename="../build/ui_mainwindow.h" line="507"/>
- <source>&amp;All</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+ <location filename="../build/ui_mainwindow.h" line="506"/>
+ <source>Ctrl+4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
- <location filename="../build/ui_mainwindow.h" line="511"/>
- <source>&amp;Next DC</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
+ <location filename="../build/ui_mainwindow.h" line="507"/>
+ <source>&amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
- <location filename="../build/ui_mainwindow.h" line="513"/>
- <source>&amp;About Subsurface</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+ <location filename="../build/ui_mainwindow.h" line="508"/>
+ <source>Ctrl+1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
- <location filename="../build/ui_mainwindow.h" line="516"/>
- <source>&amp;Globe</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+ <location filename="../build/ui_mainwindow.h" line="509"/>
+ <source>P&amp;revious DC</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
- <location filename="../build/ui_mainwindow.h" line="524"/>
- <source>Ctrl+I</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+ <location filename="../build/ui_mainwindow.h" line="510"/>
+ <source>Left</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
- <location filename="../build/ui_mainwindow.h" line="525"/>
- <source>Import &amp;from divelogs.de</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
+ <location filename="../build/ui_mainwindow.h" line="511"/>
+ <source>&amp;Next DC</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
- <location filename="../build/ui_mainwindow.h" line="526"/>
- <source>&amp;Full screen</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+ <location filename="../build/ui_mainwindow.h" line="512"/>
+ <source>Right</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
- <location filename="../build/ui_mainwindow.h" line="528"/>
- <source>Toggle full screen</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
+ <location filename="../build/ui_mainwindow.h" line="513"/>
+ <source>&amp;About Subsurface</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
- <location filename="../build/ui_mainwindow.h" line="531"/>
- <source>&amp;Check for updates</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+ <location filename="../build/ui_mainwindow.h" line="514"/>
+ <source>User &amp;manual</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
- <location filename="../build/ui_mainwindow.h" line="532"/>
- <source>&amp;Export</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+ <location filename="../build/ui_mainwindow.h" line="515"/>
+ <source>F1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
- <location filename="../build/ui_mainwindow.h" line="536"/>
- <source>Ctrl+E</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
+ <location filename="../build/ui_mainwindow.h" line="516"/>
+ <source>&amp;Globe</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
- <location filename="../build/ui_mainwindow.h" line="538"/>
- <source>Ctrl+Shift+C</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+ <location filename="../build/ui_mainwindow.h" line="517"/>
+ <source>Ctrl+5</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
- <location filename="../build/ui_mainwindow.h" line="539"/>
- <source>Edit &amp;dive in planner</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+ <location filename="../build/ui_mainwindow.h" line="518"/>
+ <source>P&amp;lan dive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
- <location filename="../build/ui_mainwindow.h" line="540"/>
- <source>Toggle pO₂ graph</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+ <location filename="../build/ui_mainwindow.h" line="519"/>
+ <source>Ctrl+L</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
- <location filename="../build/ui_mainwindow.h" line="541"/>
- <source>Toggle pN₂ graph</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+ <location filename="../build/ui_mainwindow.h" line="520"/>
+ <source>&amp;Import log files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
- <location filename="../build/ui_mainwindow.h" line="553"/>
- <source>Scale graph</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+ <location filename="../build/ui_mainwindow.h" line="522"/>
+ <source>Import divelog files from other applications</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
- <location filename="../build/ui_mainwindow.h" line="554"/>
- <source>Toggle pictures</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
+ <location filename="../build/ui_mainwindow.h" line="524"/>
+ <source>Ctrl+I</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
- <location filename="../build/ui_mainwindow.h" line="555"/>
- <source>Toggle tank bar</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
+ <location filename="../build/ui_mainwindow.h" line="525"/>
+ <source>Import &amp;from divelogs.de</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
- <location filename="../build/ui_mainwindow.h" line="556"/>
- <source>&amp;Filter divelist</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
+ <location filename="../build/ui_mainwindow.h" line="526"/>
+ <source>&amp;Full screen</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
- <location filename="../build/ui_mainwindow.h" line="558"/>
- <source>Toggle tissue graph</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
+ <location filename="../build/ui_mainwindow.h" line="528"/>
+ <source>Toggle full screen</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
- <location filename="../build/ui_mainwindow.h" line="559"/>
- <source>User &amp;survey</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+ <location filename="../build/ui_mainwindow.h" line="530"/>
+ <source>F11</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
- <location filename="../build/ui_mainwindow.h" line="560"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
- <source>&amp;Undo</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
+ <location filename="../build/ui_mainwindow.h" line="531"/>
+ <source>&amp;Check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
- <location filename="../build/ui_mainwindow.h" line="561"/>
- <source>Ctrl+Z</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
+ <location filename="../build/ui_mainwindow.h" line="532"/>
+ <source>&amp;Export</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
- <location filename="../build/ui_mainwindow.h" line="562"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
- <source>&amp;Redo</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+ <location filename="../build/ui_mainwindow.h" line="534"/>
+ <source>Export dive logs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
- <location filename="../build/ui_mainwindow.h" line="563"/>
- <source>Ctrl+Shift+Z</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
+ <location filename="../build/ui_mainwindow.h" line="536"/>
+ <source>Ctrl+E</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
- <location filename="../build/ui_mainwindow.h" line="564"/>
- <source>&amp;Find moved images</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+ <location filename="../build/ui_mainwindow.h" line="537"/>
+ <source>Configure &amp;dive computer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
- <source>Open c&amp;loud storage</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
+ <location filename="../build/ui_mainwindow.h" line="538"/>
+ <source>Ctrl+Shift+C</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
- <source>Save to clo&amp;ud storage</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
+ <location filename="../build/ui_mainwindow.h" line="539"/>
+ <source>Edit &amp;dive in planner</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
- <location filename="../build/ui_mainwindow.h" line="567"/>
- <source>&amp;Manage dive sites</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
+ <location filename="../build/ui_mainwindow.h" line="540"/>
+ <source>Toggle pO₂ graph</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
- <source>Dive Site &amp;Edit</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
+ <location filename="../build/ui_mainwindow.h" line="541"/>
+ <source>Toggle pN₂ graph</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
- <source>Facebook</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+ <location filename="../build/ui_mainwindow.h" line="542"/>
+ <source>Toggle pHe graph</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
- <source>Add GPS location here</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+ <location filename="../build/ui_mainwindow.h" line="543"/>
+ <source>Toggle DC reported ceiling</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
- <location filename="../build/ui_mainwindow.h" line="557"/>
- <source>Ctrl+F</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+ <location filename="../build/ui_mainwindow.h" line="544"/>
+ <source>Toggle calculated ceiling</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
- <location filename="../build/ui_mainwindow.h" line="478"/>
- <source>&amp;Print</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+ <location filename="../build/ui_mainwindow.h" line="545"/>
+ <source>Toggle calculating all tissues</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
- <location filename="../build/ui_mainwindow.h" line="481"/>
- <source>Ctrl+,</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+ <location filename="../build/ui_mainwindow.h" line="546"/>
+ <source>Toggle calculated ceiling with 3m increments</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
- <location filename="../build/ui_mainwindow.h" line="482"/>
- <source>&amp;Quit</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+ <location filename="../build/ui_mainwindow.h" line="547"/>
+ <source>Toggle heart rate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
- <location filename="../build/ui_mainwindow.h" line="484"/>
- <source>Import from &amp;dive computer</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+ <location filename="../build/ui_mainwindow.h" line="548"/>
+ <source>Toggle MOD</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
- <location filename="../build/ui_mainwindow.h" line="487"/>
- <source>Ctrl+G</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+ <location filename="../build/ui_mainwindow.h" line="549"/>
+ <source>Toggle EAD, END, EADD</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
- <location filename="../build/ui_mainwindow.h" line="490"/>
- <source>Ctrl++</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+ <location filename="../build/ui_mainwindow.h" line="550"/>
+ <source>Toggle NDL, TTS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
- <location filename="../build/ui_mainwindow.h" line="496"/>
- <source>&amp;Renumber</source>
- <translation type="unfinished"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+ <location filename="../build/ui_mainwindow.h" line="551"/>
+ <source>Toggle SAC rate</source>
+ <translation>SAC</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
- <location filename="../build/ui_mainwindow.h" line="497"/>
- <source>Ctrl+R</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+ <location filename="../build/ui_mainwindow.h" line="552"/>
+ <source>Toggle ruler</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
- <location filename="../build/ui_mainwindow.h" line="500"/>
- <source>Ctrl+Y</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
+ <location filename="../build/ui_mainwindow.h" line="553"/>
+ <source>Scale graph</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
- <location filename="../build/ui_mainwindow.h" line="519"/>
- <source>Ctrl+L</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
+ <location filename="../build/ui_mainwindow.h" line="554"/>
+ <source>Toggle pictures</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
- <location filename="../build/ui_mainwindow.h" line="479"/>
- <source>Ctrl+P</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
+ <location filename="../build/ui_mainwindow.h" line="555"/>
+ <source>Toggle tank bar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
- <location filename="../build/ui_mainwindow.h" line="483"/>
- <source>Ctrl+Q</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
+ <location filename="../build/ui_mainwindow.h" line="556"/>
+ <source>&amp;Filter divelist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
- <location filename="../build/ui_mainwindow.h" line="485"/>
- <source>Ctrl+D</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+ <location filename="../build/ui_mainwindow.h" line="557"/>
+ <source>Ctrl+F</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
- <location filename="../build/ui_mainwindow.h" line="489"/>
- <source>&amp;Add dive</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+ <source>Toggle tissue heat-map</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
- <location filename="../build/ui_mainwindow.h" line="498"/>
- <source>Auto &amp;group</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
+ <location filename="../build/ui_mainwindow.h" line="559"/>
+ <source>User &amp;survey</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
- <location filename="../build/ui_mainwindow.h" line="499"/>
- <source>&amp;Yearly statistics</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
+ <location filename="../build/ui_mainwindow.h" line="560"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
+ <source>&amp;Undo</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
- <location filename="../build/ui_mainwindow.h" line="501"/>
- <source>&amp;Dive list</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
+ <location filename="../build/ui_mainwindow.h" line="561"/>
+ <source>Ctrl+Z</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
- <location filename="../build/ui_mainwindow.h" line="502"/>
- <source>Ctrl+2</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
+ <location filename="../build/ui_mainwindow.h" line="562"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
+ <source>&amp;Redo</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
- <location filename="../build/ui_mainwindow.h" line="504"/>
- <source>Ctrl+3</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
+ <location filename="../build/ui_mainwindow.h" line="563"/>
+ <source>Ctrl+Shift+Z</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
- <location filename="../build/ui_mainwindow.h" line="506"/>
- <source>Ctrl+4</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
+ <location filename="../build/ui_mainwindow.h" line="564"/>
+ <source>&amp;Find moved images</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
- <location filename="../build/ui_mainwindow.h" line="508"/>
- <source>Ctrl+1</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
+ <source>Open c&amp;loud storage</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
- <location filename="../build/ui_mainwindow.h" line="509"/>
- <source>P&amp;revious DC</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
+ <source>Save to clo&amp;ud storage</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
- <location filename="../build/ui_mainwindow.h" line="510"/>
- <source>Left</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
+ <location filename="../build/ui_mainwindow.h" line="567"/>
+ <source>&amp;Manage dive sites</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
- <location filename="../build/ui_mainwindow.h" line="512"/>
- <source>Right</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
+ <source>Dive Site &amp;Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
- <location filename="../build/ui_mainwindow.h" line="514"/>
- <source>User &amp;manual</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
+ <source>Facebook</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
- <location filename="../build/ui_mainwindow.h" line="515"/>
- <source>F1</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+ <source>Take cloud storage online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
- <location filename="../build/ui_mainwindow.h" line="517"/>
- <source>Ctrl+5</source>
+ <location filename="../build/ui_mainwindow.h" line="558"/>
+ <source>Toggle tissue graph</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
- <location filename="../build/ui_mainwindow.h" line="518"/>
- <source>P&amp;lan dive</source>
+ <location filename="../build/ui_mainwindow.h" line="565"/>
+ <source>Open cloud storage</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
- <location filename="../build/ui_mainwindow.h" line="520"/>
- <source>&amp;Import log files</source>
+ <location filename="../build/ui_mainwindow.h" line="566"/>
+ <source>Save to cloud storage</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
- <location filename="../build/ui_mainwindow.h" line="522"/>
- <source>Import divelog files from other applications</source>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+ <source>Connect to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
- <location filename="../build/ui_mainwindow.h" line="530"/>
- <source>F11</source>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+ <source>Please save or cancel the current dive edit before opening a new file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
<source>Open file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
<location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -5241,6 +5340,16 @@ mixed from Air and using:
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+ <source>Warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
<source>Please save or cancel the current dive edit before closing the file.</source>
<translation type="unfinished"/>
@@ -5256,124 +5365,97 @@ mixed from Air and using:
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
- <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
- <source>Do you want to save the changes that you made in the file %1?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
- <source>Do you want to save the changes that you made in the data file?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
- <source>Save changes?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
- <source>Save file as</source>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+ <source>Trying to replan a dive that&apos;s not a planned dive.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
- <source>[cloud storage for] %1</source>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+ <source>Please, first finish the current edition before trying to do another.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
- <source>Opening datafile from older version</source>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+ <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
- <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
-Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+ <source>Yearly statistics</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
- <source>Open dive log file</source>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
+ <source>Do you want to save the changes that you made in the file %1?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
- <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
+ <source>Do you want to save the changes that you made in the data file?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
- <source>Contacting cloud service...</source>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
+ <source>Save changes?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
<source>Changes will be lost if you don&apos;t save them.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
- <source>Warning</source>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1572"/>
+ <source>Save file as</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
- <source>Please save or cancel the current dive edit before opening a new file.</source>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+ <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
- <source>Connect to</source>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+ <source>[local cache for] %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
- <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
+ <source>[cloud storage for] %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
- <source>Yearly statistics</source>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
+ <source>Opening datafile from older version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
- <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
+ <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
+Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
- <source>Please, first finish the current edition before trying to do another.</source>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
+ <source>Open dive log file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_mainwindow.h" line="565"/>
- <source>Open cloud storage</source>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
+ <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_mainwindow.h" line="566"/>
- <source>Save to cloud storage</source>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
+ <source>Contacting cloud service...</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>MultiFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
<source>Filter shows %1 (of %2) dives</source>
<translation type="unfinished"/>
</message>
@@ -5381,39 +5463,39 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
<context>
<name>OstcFirmwareCheck</name>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
<source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
<source>
Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
<source>Not now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
<source>Update firmware</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
<source>Firmware upgrade notice</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
<source>Save the downloaded firmware as</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
<source>HEX files (*.hex)</source>
<translation type="unfinished"/>
</message>
@@ -5421,79 +5503,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>PlannerSettingsWidget</name>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
<source>Open circuit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
<source>CCR</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
<source>pSCR</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
<source>ft/min</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
<source>Last stop at 20ft</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
<source>50% avg. depth to 20ft</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
<source>20ft to surface</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+ <source>ft</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
<source>m/min</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
<source>Last stop at 6m</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
<source>50% avg. depth to 6m</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
<source>6m to surface</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
- <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+ <source>m</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
<source>cuft/min</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
- <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
<source>ℓ/min</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
<source>bar</source>
<translation>bar</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
<source>psi</source>
<translation>psi</translation>
</message>
@@ -5643,6 +5735,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>PreferencesDialog</name>
<message>
+ <location filename="../build/ui_preferences.h" line="1283"/>
+ <source>Preferences</source>
+ <translation>Tùy biến</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1288"/>
<source>Defaults</source>
<translation type="unfinished"/>
@@ -5678,6 +5775,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1303"/>
+ <source>Lists and tables</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1304"/>
<source>Font</source>
<translation>Kiểu chữ</translation>
@@ -5693,6 +5795,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Lần lặn</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1307"/>
+ <source>Default dive log file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1308"/>
<source>No default file</source>
<translation type="unfinished"/>
@@ -5723,6 +5830,21 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1314"/>
+ <source>Display invalid</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1316"/>
+ <source>Default cylinder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1317"/>
+ <source>Use default cylinder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1318"/>
<source>Animations</source>
<translation type="unfinished"/>
@@ -5753,39 +5875,23 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1401"/>
- <source>Dive site geo lookup</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1402"/>
- <source>Enable geocoding for dive site management</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1403"/>
- <source>Parse site without GPS data</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1404"/>
- <source>Same format for existing dives</source>
+ <location filename="../build/ui_preferences.h" line="1324"/>
+ <source>&amp;Metric</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1405"/>
- <source>Dive Site Layout</source>
+ <location filename="../build/ui_preferences.h" line="1325"/>
+ <source>Imperial</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1406"/>
- <location filename="../build/ui_preferences.h" line="1407"/>
- <source>/</source>
+ <location filename="../build/ui_preferences.h" line="1326"/>
+ <source>Personali&amp;ze</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1325"/>
- <source>Imperial</source>
+ <location filename="../build/ui_preferences.h" line="1327"/>
+ <source>Individual settings</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5804,6 +5910,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1331"/>
+ <source>Pressure</source>
+ <translation>Áp suất</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1332"/>
<location filename="../build/ui_preferences.h" line="1366"/>
<source>bar</source>
@@ -5815,11 +5926,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>psi</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1334"/>
+ <source>Volume</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1335"/>
+ <source>&amp;liter</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1336"/>
<source>cu ft</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1337"/>
+ <source>Temperature</source>
+ <translation>Nhiệt độ</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1338"/>
<source>celsius</source>
<translation type="unfinished"/>
@@ -5830,314 +5956,280 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1340"/>
+ <source>Weight</source>
+ <translation>Cân nặng</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1341"/>
<source>kg</source>
<translation>ký</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1363"/>
- <source>CCR: show setpoints when viewing pO₂</source>
- <translation type="unfinished"/>
+ <location filename="../build/ui_preferences.h" line="1342"/>
+ <source>lbs</source>
+ <translation>lbs</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1364"/>
- <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
+ <location filename="../build/ui_preferences.h" line="1343"/>
+ <source>Time units</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1365"/>
- <source>Default CCR set-point for dive planning</source>
+ <location filename="../build/ui_preferences.h" line="1344"/>
+ <source>Ascent/descent speed denominator</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1367"/>
- <source>pSCR O₂ metabolism rate</source>
+ <location filename="../build/ui_preferences.h" line="1345"/>
+ <source>Minutes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1368"/>
- <source>pSCR ratio</source>
+ <location filename="../build/ui_preferences.h" line="1346"/>
+ <source>Seconds</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1369"/>
- <source>ℓ/min</source>
+ <location filename="../build/ui_preferences.h" line="1347"/>
+ <source>GPS coordinates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1371"/>
- <source>1:</source>
+ <location filename="../build/ui_preferences.h" line="1348"/>
+ <source>Location Display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1372"/>
- <source>UI language</source>
+ <location filename="../build/ui_preferences.h" line="1349"/>
+ <source>traditional (dms)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1373"/>
- <source>System default</source>
+ <location filename="../build/ui_preferences.h" line="1350"/>
+ <source>decimal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1375"/>
- <source>Proxy</source>
+ <location filename="../build/ui_preferences.h" line="1351"/>
+ <source>Show</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1379"/>
- <source>Proxy type</source>
+ <location filename="../build/ui_preferences.h" line="1352"/>
+ <source>Threshold when showing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1377"/>
- <source>Host</source>
+ <location filename="../build/ui_preferences.h" line="1353"/>
+ <source>Threshold when showing pN₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1376"/>
- <source>Port</source>
+ <location filename="../build/ui_preferences.h" line="1354"/>
+ <source>Threshold when showing pHe</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1378"/>
- <source>Requires authentication</source>
+ <location filename="../build/ui_preferences.h" line="1355"/>
+ <source>Max pO₂ when showing MOD</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1380"/>
- <source>Username</source>
+ <location filename="../build/ui_preferences.h" line="1356"/>
+ <source>Draw dive computer reported ceiling red</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1381"/>
- <location filename="../build/ui_preferences.h" line="1387"/>
- <source>Password</source>
- <translation>Mật khẩu</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1400"/>
- <source>Disconnect from Facebook</source>
+ <location filename="../build/ui_preferences.h" line="1357"/>
+ <source>Show unused cylinders in Equipment tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1374"/>
- <source>Filter</source>
- <translation>Bộ lọc</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1331"/>
- <source>Pressure</source>
- <translation>Áp suất</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1303"/>
- <source>Lists and tables</source>
+ <location filename="../build/ui_preferences.h" line="1358"/>
+ <source>Show average depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1307"/>
- <source>Default dive log file</source>
+ <location filename="../build/ui_preferences.h" line="1359"/>
+ <source>Misc</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1314"/>
- <source>Display invalid</source>
+ <location filename="../build/ui_preferences.h" line="1360"/>
+ <source>GFLow</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1316"/>
- <source>Default cylinder</source>
+ <location filename="../build/ui_preferences.h" line="1361"/>
+ <source>GFHigh</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1317"/>
- <source>Use default cylinder</source>
+ <location filename="../build/ui_preferences.h" line="1362"/>
+ <source>GFLow at max depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1382"/>
- <source>Subsurface cloud storage</source>
+ <location filename="../build/ui_preferences.h" line="1363"/>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1386"/>
- <source>Email address</source>
- <translation>Địa chỉ email</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1388"/>
- <source>Verification PIN</source>
+ <location filename="../build/ui_preferences.h" line="1364"/>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1395"/>
- <source>Sync to cloud in the background?</source>
+ <location filename="../build/ui_preferences.h" line="1365"/>
+ <source>Default CCR set-point for dive planning</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1396"/>
- <source>Save Password locally?</source>
+ <location filename="../build/ui_preferences.h" line="1367"/>
+ <source>pSCR O₂ metabolism rate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1397"/>
- <source>Subsurface web service</source>
+ <location filename="../build/ui_preferences.h" line="1368"/>
+ <source>pSCR ratio</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1398"/>
- <source>Default user ID</source>
+ <location filename="../build/ui_preferences.h" line="1369"/>
+ <source>ℓ/min</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1399"/>
- <source>Save user ID locally?</source>
+ <location filename="../build/ui_preferences.h" line="1371"/>
+ <source>1:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1334"/>
- <source>Volume</source>
+ <location filename="../build/ui_preferences.h" line="1372"/>
+ <source>UI language</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1337"/>
- <source>Temperature</source>
- <translation>Nhiệt độ</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1340"/>
- <source>Weight</source>
- <translation>Cân nặng</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1342"/>
- <source>lbs</source>
- <translation>lbs</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1343"/>
- <source>Time units</source>
+ <location filename="../build/ui_preferences.h" line="1373"/>
+ <source>System default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1345"/>
- <source>Minutes</source>
- <translation type="unfinished"/>
+ <location filename="../build/ui_preferences.h" line="1374"/>
+ <source>Filter</source>
+ <translation>Bộ lọc</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1346"/>
- <source>Seconds</source>
+ <location filename="../build/ui_preferences.h" line="1375"/>
+ <source>Proxy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1351"/>
- <source>Show</source>
+ <location filename="../build/ui_preferences.h" line="1376"/>
+ <source>Port</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1362"/>
- <source>GFLow at max depth</source>
+ <location filename="../build/ui_preferences.h" line="1377"/>
+ <source>Host</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1359"/>
- <source>Misc</source>
+ <location filename="../build/ui_preferences.h" line="1378"/>
+ <source>Requires authentication</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1283"/>
- <source>Preferences</source>
- <translation>Tùy biến</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1324"/>
- <source>&amp;Metric</source>
+ <location filename="../build/ui_preferences.h" line="1379"/>
+ <source>Proxy type</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1326"/>
- <source>Personali&amp;ze</source>
+ <location filename="../build/ui_preferences.h" line="1380"/>
+ <source>Username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1327"/>
- <source>Individual settings</source>
- <translation type="unfinished"/>
+ <location filename="../build/ui_preferences.h" line="1381"/>
+ <location filename="../build/ui_preferences.h" line="1387"/>
+ <source>Password</source>
+ <translation>Mật khẩu</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1335"/>
- <source>&amp;liter</source>
+ <location filename="../build/ui_preferences.h" line="1382"/>
+ <source>Subsurface cloud storage</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1344"/>
- <source>Ascent/descent speed denominator</source>
- <translation type="unfinished"/>
+ <location filename="../build/ui_preferences.h" line="1386"/>
+ <source>Email address</source>
+ <translation>Địa chỉ email</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1347"/>
- <source>GPS coordinates</source>
+ <location filename="../build/ui_preferences.h" line="1388"/>
+ <source>Verification PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1348"/>
- <source>Location Display</source>
+ <location filename="../build/ui_preferences.h" line="1395"/>
+ <source>Sync to cloud in the background?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1349"/>
- <source>traditional (dms)</source>
+ <location filename="../build/ui_preferences.h" line="1396"/>
+ <source>Save Password locally?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1350"/>
- <source>decimal</source>
+ <location filename="../build/ui_preferences.h" line="1397"/>
+ <source>Subsurface web service</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1352"/>
- <source>Threshold when showing pO₂</source>
+ <location filename="../build/ui_preferences.h" line="1398"/>
+ <source>Default user ID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1353"/>
- <source>Threshold when showing pN₂</source>
+ <location filename="../build/ui_preferences.h" line="1399"/>
+ <source>Save user ID locally?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1354"/>
- <source>Threshold when showing pHe</source>
+ <location filename="../build/ui_preferences.h" line="1400"/>
+ <source>Disconnect from Facebook</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1355"/>
- <source>Max pO₂ when showing MOD</source>
+ <location filename="../build/ui_preferences.h" line="1401"/>
+ <source>Dive site geo lookup</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1356"/>
- <source>Draw dive computer reported ceiling red</source>
+ <location filename="../build/ui_preferences.h" line="1402"/>
+ <source>Enable geocoding for dive site management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1357"/>
- <source>Show unused cylinders in Equipment tab</source>
+ <location filename="../build/ui_preferences.h" line="1403"/>
+ <source>Parse site without GPS data</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1358"/>
- <source>Show average depth</source>
+ <location filename="../build/ui_preferences.h" line="1404"/>
+ <source>Same format for existing dives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1360"/>
- <source>GFLow</source>
+ <location filename="../build/ui_preferences.h" line="1405"/>
+ <source>Dive Site Layout</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1361"/>
- <source>GFHigh</source>
+ <location filename="../build/ui_preferences.h" line="1406"/>
+ <location filename="../build/ui_preferences.h" line="1407"/>
+ <source>/</source>
<translation type="unfinished"/>
</message>
</context>
@@ -6194,106 +6286,136 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
- <source>Show</source>
+ <source>Gas pressure display setup</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
- <source>Threshold when showing pO₂</source>
+ <source>Threshold for pO₂ (bar)</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
- <source>Threshold when showing pN₂</source>
+ <source>Threshold for pN₂ (bar)</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
- <source>Threshold when showing pHe</source>
+ <source>Threshold for pHe (bar)</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
- <source>Max pO₂ when showing MOD</source>
+ <source>pO₂ in calculating MOD (bar)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+ <source>CCR options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+ <source>Dive planner default setpoint (bar)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+ <source>Show setpoints when viewing pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+ <source>Show individual O₂ sensor values when viewing pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+ <source>Ceiling display setup</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
<source>Draw dive computer reported ceiling red</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
- <source>Show unused cylinders in Equipment tab</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+ <source>Algorithm for calculated ceiling:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
- <source>Show mean depth</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+ <source>VPM-B</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
- <source>Misc</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+ <source>VPM-B Conservatism</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
- <source>bar</source>
- <translation>bar</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+ <source>+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
- <source>Default CCR set-point for dive planning</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+ <source>Bühlmann</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
- <source>pSCR O₂ metabolism rate</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+ <source>GFHigh</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
<source>GFLow</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
- <source>GFHigh</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+ <source>GFLow at max depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
- <source>ℓ/min</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+ <source>pSCR options:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
- <source>pSCR ratio</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+ <source>Metabolic rate (ℓ O₂/min)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+ <source>Dilution ratio</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
<source>1:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
- <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+ <source>Misc</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
- <source>CCR: show setpoints when viewing pO₂</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+ <source>Show unused cylinders in Equipment tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
- <source>GFLow at max depth</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+ <source>Show mean depth in Profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
<source>Graph</source>
<translation type="unfinished"/>
</message>
@@ -6362,15 +6484,29 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+ <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
<source>Restart required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+ <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
<source>To correctly load a new language you must restart Subsurface.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+ <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+ <source>Literal characters</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+ <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+ <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>PreferencesNetwork</name>
@@ -6417,7 +6553,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
<source>Subsurface cloud storage</source>
<translation type="unfinished"/>
</message>
@@ -6462,39 +6598,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
<source>Network</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
<source>No proxy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
<source>System proxy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
<source>HTTP proxy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
<source>SOCKS proxy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
<source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
<source>Subsurface cloud storage (credentials verified)</source>
<translation type="unfinished"/>
</message>
@@ -6652,7 +6788,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+ <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
<source>Units</source>
<translation>Đơn vị</translation>
</message>
@@ -6660,17 +6796,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>PrintDialog</name>
<message>
- <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
- <source>&amp;Preview</source>
+ <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
+ <source>P&amp;rint</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
- <source>P&amp;rint</source>
+ <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+ <source>&amp;Preview</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+ <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
<source>Print</source>
<translation type="unfinished"/>
</message>
@@ -6678,19 +6814,10 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>PrintOptions</name>
<message>
- <location filename="../build/ui_printoptions.h" line="150"/>
- <source>&amp;Table print</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../build/ui_printoptions.h" line="158"/>
- <source>One dive per page</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../build/ui_printoptions.h" line="159"/>
- <source>Two dives per page</source>
- <translation type="unfinished"/>
+ <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+ <location filename="../build/ui_printoptions.h" line="148"/>
+ <source>Print type</source>
+ <translation>Loại in</translation>
</message>
<message>
<location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6750,10 +6877,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/printoptions.ui" line="29"/>
- <location filename="../build/ui_printoptions.h" line="148"/>
- <source>Print type</source>
- <translation>Loại in</translation>
+ <location filename="../build/ui_printoptions.h" line="150"/>
+ <source>&amp;Table print</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../build/ui_printoptions.h" line="158"/>
+ <source>One dive per page</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../build/ui_printoptions.h" line="159"/>
+ <source>Two dives per page</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6795,103 +6931,103 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
<source>Show NDL / TTS was disabled because of excessive processing time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
<source>Make first divecomputer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
<source>Delete this divecomputer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
<source>Add gas change</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
<source> (Tank %1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
<source>Add set-point change</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
<source>Add bookmark</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
<source>Edit the profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
<source>Remove event</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
<source>Hide similar events</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
<source>Edit name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
- <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
<source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
<source>Unhide all events</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
<source>Hide events</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
<source>Hide all %1 events?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
<source>Remove the selected event?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
<source>%1 @ %2:%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
<source>Edit name of bookmark</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
<source>Custom name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
<source>Name is too long!</source>
<translation type="unfinished"/>
</message>
@@ -6899,91 +7035,101 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>QMLManager</name>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
<source>Starting...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
<source>working in no-cloud mode</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
<source>no cloud credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
<source>Please enter valid cloud credentials.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
<source>Attempting to open cloud storage with new credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
<source>Testing cloud credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+ <source>No response from cloud server to validate the credentials</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+ <source>Cannot connect to cloud storage - cloud account not verified</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
<source>Cloud credentials are invalid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
<source>Cannot open cloud storage: Error creating https connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
<source>Cannot open cloud storage: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
<source>Cannot connect to cloud storage</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
<source>Cloud storage error: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
<source>Failed to connect to cloud server, reverting to no cloud status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
<source>Cloud storage open successfully. No dives in dive list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
<source>h</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
<source>min</source>
<translation>nhỏ nhất</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
<source>sec</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
<source>Unknown GPS location</source>
<translation type="unfinished"/>
</message>
@@ -6991,126 +7137,126 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>QObject</name>
<message>
- <location filename="../core/qthelper.cpp" line="866"/>
- <location filename="../core/qthelper.cpp" line="1214"/>
- <source>AIR</source>
- <translation>KHÔNG KHÍ</translation>
+ <location filename="../core/gpslocation.h" line="13"/>
+ <source>Waiting to aquire GPS location</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="1214"/>
- <source>OXYGEN</source>
- <translation type="unfinished"/>
+ <location filename="../core/qthelper.cpp" line="766"/>
+ <location filename="../core/qthelper.cpp" line="1275"/>
+ <source>m</source>
+ <translation>m</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
- <source>Remove this point</source>
- <translation type="unfinished"/>
+ <location filename="../core/qthelper.cpp" line="768"/>
+ <location filename="../core/qthelper.cpp" line="1274"/>
+ <source>ft</source>
+ <translation>ft</translation>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
- <source>Average</source>
- <translation>Trung bình</translation>
+ <location filename="../core/qthelper.cpp" line="794"/>
+ <source>C</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
- <source>Minimum</source>
- <translation>Nhỏ nhất</translation>
+ <location filename="../core/qthelper.cpp" line="796"/>
+ <source>F</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
- <source>Maximum</source>
- <translation>Tối đa</translation>
+ <location filename="../core/qthelper.cpp" line="821"/>
+ <location filename="../core/qthelper.cpp" line="1250"/>
+ <source>kg</source>
+ <translation>ký</translation>
</message>
<message>
- <location filename="../desktop-widgets/globe.cpp" line="327"/>
- <source>Move the map and double-click to set the dive location</source>
- <translation type="unfinished"/>
+ <location filename="../core/qthelper.cpp" line="823"/>
+ <location filename="../core/qthelper.cpp" line="1251"/>
+ <source>lbs</source>
+ <translation>lbs</translation>
</message>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
- <source>unknown</source>
- <translation>chưa rõ</translation>
+ <location filename="../core/qthelper.cpp" line="848"/>
+ <location filename="../core/qthelper.cpp" line="1300"/>
+ <source>bar</source>
+ <translation>bar</translation>
</message>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
- <source>h:</source>
- <translation type="unfinished"/>
+ <location filename="../core/qthelper.cpp" line="850"/>
+ <location filename="../core/qthelper.cpp" line="1299"/>
+ <source>psi</source>
+ <translation>psi</translation>
</message>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
- <source>min</source>
- <translation>nhỏ nhất</translation>
+ <location filename="../core/qthelper.cpp" line="871"/>
+ <location filename="../core/qthelper.cpp" line="1235"/>
+ <source>AIR</source>
+ <translation>KHÔNG KHÍ</translation>
</message>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
- <source>Multiple</source>
+ <location filename="../core/qthelper.cpp" line="873"/>
+ <source>EAN</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../core/qthelper.cpp" line="957"/>
+ <location filename="../core/qthelper.cpp" line="962"/>
<source>(%n dive(s))</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="816"/>
- <location filename="../core/qthelper.cpp" line="1228"/>
- <source>kg</source>
- <translation>ký</translation>
+ <location filename="../core/qthelper.cpp" line="1235"/>
+ <source>OXYGEN</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="818"/>
- <location filename="../core/qthelper.cpp" line="1229"/>
- <source>lbs</source>
- <translation>lbs</translation>
+ <location filename="../core/qthelper.cpp" line="1322"/>
+ <source>l</source>
+ <translation>l</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="763"/>
- <location filename="../core/qthelper.cpp" line="1252"/>
- <source>ft</source>
- <translation>ft</translation>
+ <location filename="../core/qthelper.cpp" line="1323"/>
+ <source>cuft</source>
+ <translation>cuft</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="761"/>
- <location filename="../core/qthelper.cpp" line="1253"/>
- <source>m</source>
- <translation>m</translation>
+ <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+ <source>unknown</source>
+ <translation>chưa rõ</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="789"/>
- <source>C</source>
+ <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+ <source>h:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="791"/>
- <source>F</source>
- <translation type="unfinished"/>
+ <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+ <source>min</source>
+ <translation>nhỏ nhất</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="845"/>
- <location filename="../core/qthelper.cpp" line="1275"/>
- <source>psi</source>
- <translation>psi</translation>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+ <source>Remove this point</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="843"/>
- <location filename="../core/qthelper.cpp" line="1276"/>
- <source>bar</source>
- <translation>bar</translation>
+ <location filename="../desktop-widgets/globe.cpp" line="327"/>
+ <source>Move the map and double-click to set the dive location</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="868"/>
- <source>EAN</source>
- <translation type="unfinished"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+ <source>Average</source>
+ <translation>Trung bình</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="1298"/>
- <source>l</source>
- <translation>l</translation>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+ <source>Minimum</source>
+ <translation>Nhỏ nhất</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="1299"/>
- <source>cuft</source>
- <translation>cuft</translation>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+ <source>Maximum</source>
+ <translation>Tối đa</translation>
</message>
<message>
<location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7132,17 +7278,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<source>Malformed XML response. Line %1: %2</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../core/gpslocation.h" line="13"/>
- <source>Waiting to aquire GPS location</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ReadSettingsThread</name>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
<source>This feature is not yet available for the selected dive computer.</source>
<translation type="unfinished"/>
</message>
@@ -7171,7 +7312,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>ResetSettingsThread</name>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
<source>Reset settings failed!</source>
<translation type="unfinished"/>
</message>
@@ -7209,6 +7350,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>ShiftImageTimesDialog</name>
<message>
+ <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+ <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+ <source>Shift selected image times</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
<location filename="../build/ui_shiftimagetimes.h" line="185"/>
<source>Shift times of image(s) by</source>
@@ -7221,12 +7368,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
- <location filename="../build/ui_shiftimagetimes.h" line="184"/>
- <source>Shift selected image times</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
<location filename="../build/ui_shiftimagetimes.h" line="187"/>
<source>Earlier</source>
@@ -7276,12 +7417,12 @@ Not all images have timestamps in the range between
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
<source>Open image file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
<source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
<translation>Tập tin hình ảnh (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
</message>
@@ -7439,49 +7580,49 @@ Not all images have timestamps in the range between
<context>
<name>SocialNetworkDialog</name>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
<source>Dive date: %1
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
<source>Duration: %1
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
<source>h:</source>
<comment>abbreviation for hours plus separator</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
<source>min</source>
<comment>abbreviation for minutes</comment>
<translation>nhỏ nhất</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
<source>Dive location: %1
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
<source>Buddy: %1
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
<source>Divemaster: %1
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
<source>
%1</source>
<translation type="unfinished"/>
@@ -7566,9 +7707,20 @@ Not all images have timestamps in the range between
<name>StartPage</name>
<message>
<location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
- <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+ <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+ <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+ <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
<translation type="unfinished"/>
</message>
</context>
@@ -7607,7 +7759,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>SubsurfaceWebServices</name>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+ <source>Enter User ID and click Download</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
<source>Webservice</source>
<translation>Dịch vụ web</translation>
</message>
@@ -7632,30 +7789,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
- <source>Download successful</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
<source>Invalid user identifier!</source>
<translation>Nhận dạng người dùng không hợp lệ!</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
- <source>Enter User ID and click Download</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
<source>Cannot parse response!</source>
<translation>Không nhận được trả lời!</translation>
</message>
+ <message>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+ <source>Download successful</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SuitFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
<source>Suits: </source>
<translation type="unfinished"/>
</message>
@@ -7663,7 +7815,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>SuitsFilterModel</name>
<message>
- <location filename="../qt-models/filtermodels.cpp" line="123"/>
+ <location filename="../qt-models/filtermodels.cpp" line="128"/>
<source>No suit set</source>
<translation type="unfinished"/>
</message>
@@ -7682,7 +7834,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>TagFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
<source>Tags: </source>
<translation type="unfinished"/>
</message>
@@ -7690,7 +7842,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>TagFilterModel</name>
<message>
- <location filename="../qt-models/filtermodels.cpp" line="148"/>
+ <location filename="../qt-models/filtermodels.cpp" line="153"/>
<source>Empty tags</source>
<translation type="unfinished"/>
</message>
@@ -7716,6 +7868,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>TemplateEdit</name>
<message>
+ <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+ <source>Edit template</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/templateedit.ui" line="37"/>
<source>Preview</source>
<translation type="unfinished"/>
@@ -7761,11 +7918,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<translation>Kích thước kiểu chữ</translation>
</message>
<message>
- <location filename="../desktop-widgets/templateedit.ui" line="14"/>
- <source>Edit template</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../desktop-widgets/templateedit.ui" line="165"/>
<source>Color palette</source>
<translation type="unfinished"/>
@@ -7947,85 +8099,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>TextHyperlinkEventFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
<source>%1click to visit %2</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>ThemeTest</name>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
- <source>Theme Information</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
- <source>Screen</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
- <source>Geometry (pixels):</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
- <source>Geometry (gridUnits):</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
- <source>Units.gridUnit:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
- <source>Units.devicePixelRatio:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
- <source>Font Metrics</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
- <source>FontMetrics pointSize:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
- <source>FontMetrics pixelSize:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
- <source>FontMetrics devicePixelRatio:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
- <source>Text item pixelSize:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
- <source>Text item pointSize:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
- <source>Pixel density:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
- <source>Height of default font:</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>ToolTipItem</name>
<message>
<location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8036,102 +8115,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>TripItem</name>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="68"/>
<source>(%1 shown)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="212"/>
<source>#</source>
<translation>#</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="215"/>
<source>Date</source>
<translation>Ngày tháng</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="218"/>
<source>Rating</source>
<translation>Xếp hạng</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="221"/>
<source>Depth(%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="221"/>
<source>m</source>
<translation>m</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="221"/>
<source>ft</source>
<translation>ft</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="224"/>
<source>Duration</source>
<translation>Độ dài</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="227"/>
<source>Temp(%1%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="230"/>
<source>Weight(%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="230"/>
<source>kg</source>
<translation>ký</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="230"/>
<source>lbs</source>
<translation>lbs</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="233"/>
<source>Suit</source>
<translation>Đồ lặn</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="236"/>
<source>Cyl</source>
<translation>Xlanh</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="239"/>
<source>Gas</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="244"/>
<source>SAC(%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="244"/>
<source>/min</source>
<translation>/nhỏ nhất</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="247"/>
<source>OTU</source>
<translation>OTU</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="250"/>
<source>Max CNS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+ <source>Photos before/during/after dive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="256"/>
<source>Location</source>
<translation>Địa điểm</translation>
</message>
@@ -8154,72 +8238,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>UpdateManager</name>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
<source>Check for updates.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
<source>Subsurface was unable to check for updates.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
<source>The following error occurred:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
<source>Please check your internet connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
<source>You are using the latest version of Subsurface.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
<source>A new version of Subsurface is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
<source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
<source>Newest release version is </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
<source>The server returned the following information:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
- <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+ <source>Subsurface is checking every two weeks if a new version is available.
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
<source>Decline</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
<source>Accept</source>
<translation>Chấp nhậ</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
<source>Automatic check for updates</source>
<translation type="unfinished"/>
</message>
@@ -8241,24 +8326,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>UserSurvey</name>
<message>
- <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
- <location filename="../build/ui_usersurvey.h" line="151"/>
- <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
- <location filename="../build/ui_usersurvey.h" line="156"/>
- <source>Other software/sources</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
- <location filename="../build/ui_usersurvey.h" line="157"/>
- <source>Manually entering dives</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../desktop-widgets/usersurvey.ui" line="14"/>
<location filename="../build/ui_usersurvey.h" line="149"/>
<source>User survey</source>
@@ -8271,6 +8338,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+ <location filename="../build/ui_usersurvey.h" line="151"/>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/usersurvey.ui" line="63"/>
<location filename="../build/ui_usersurvey.h" line="152"/>
<source>Technical diver</source>
@@ -8295,6 +8368,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+ <location filename="../build/ui_usersurvey.h" line="156"/>
+ <source>Other software/sources</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+ <location filename="../build/ui_usersurvey.h" line="157"/>
+ <source>Manually entering dives</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/usersurvey.ui" line="141"/>
<location filename="../build/ui_usersurvey.h" line="158"/>
<source>Android/iPhone companion app</source>
@@ -8325,6 +8410,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+ <source>Send</source>
+ <translation>Gửi</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
<source>
Operating system: %1</source>
@@ -8364,19 +8454,14 @@ Language: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
- <source>Submit user survey.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
<source>Ask again?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
- <source>Send</source>
- <translation>Gửi</translation>
+ <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+ <source>Submit user survey.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8468,12 +8553,12 @@ Language: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
<source>Operation timed out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
<source>Transferring data...</source>
<translation type="unfinished"/>
</message>
@@ -8508,16 +8593,16 @@ Language: %1</source>
<context>
<name>WriteSettingsThread</name>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
- <source>Failed!</source>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
+ <source>This feature is not yet available for the selected dive computer.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
- <source>This feature is not yet available for the selected dive computer.</source>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+ <source>Failed!</source>
<translation type="unfinished"/>
</message>
</context>
@@ -8634,7 +8719,7 @@ Maximum</source>
<context>
<name>getextFromC</name>
<message>
- <location filename="../core/libdivecomputer.c" line="674"/>
+ <location filename="../core/libdivecomputer.c" line="737"/>
<source>Error parsing the header</source>
<translation type="unfinished"/>
</message>
@@ -8642,38 +8727,377 @@ Maximum</source>
<context>
<name>gettextFromC</name>
<message>
+ <location filename="../core/cochran.c" line="309"/>
+ <location filename="../core/cochran.c" line="315"/>
+ <location filename="../core/cochran.c" line="385"/>
+ <location filename="../core/libdivecomputer.c" line="223"/>
+ <source>deco stop</source>
+ <translation>dừng lại deco</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="336"/>
+ <location filename="../core/cochran.c" line="390"/>
+ <location filename="../core/file.c" line="777"/>
+ <location filename="../core/libdivecomputer.c" line="223"/>
+ <source>ascent</source>
+ <translation>đường dốc</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="342"/>
+ <location filename="../core/file.c" line="755"/>
+ <source>battery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="348"/>
+ <location filename="../core/libdivecomputer.c" line="227"/>
+ <source>OLF</source>
+ <translation>OLF</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="353"/>
+ <location filename="../core/libdivecomputer.c" line="227"/>
+ <source>maxdepth</source>
+ <translation>độ sâu tối đa</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="358"/>
+ <location filename="../core/cochran.c" line="404"/>
+ <location filename="../core/libdivecomputer.c" line="227"/>
+ <source>pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="365"/>
+ <location filename="../core/cochran.c" line="414"/>
+ <location filename="../core/cochran.c" line="421"/>
+ <location filename="../core/file.c" line="868"/>
+ <location filename="../core/libdivecomputer.c" line="225"/>
+ <location filename="../core/libdivecomputer.c" line="228"/>
+ <source>gaschange</source>
+ <translation>thay đổi dưỡng khí</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="370"/>
+ <location filename="../core/cochran.c" line="409"/>
+ <location filename="../core/libdivecomputer.c" line="223"/>
+ <source>rbt</source>
+ <translation>rbt</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="379"/>
+ <location filename="../core/cochran.c" line="426"/>
+ <location filename="../core/libdivecomputer.c" line="223"/>
+ <source>ceiling</source>
+ <translation>trần</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="395"/>
+ <location filename="../core/libdivecomputer.c" line="224"/>
+ <source>transmitter</source>
+ <translation>máy phát radio</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="153"/>
+ <source>Error: the file does not appear to be a DATATRAK divelog</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="286"/>
+ <source>clear</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="289"/>
+ <source>misty</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="292"/>
+ <source>fog</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="295"/>
+ <source>rain</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="298"/>
+ <source>storm</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="301"/>
+ <source>snow</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="321"/>
+ <source>No suit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="324"/>
+ <source>Shorty</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="327"/>
+ <source>Combi</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="330"/>
+ <source>Wet suit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="333"/>
+ <source>Semidry suit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="336"/>
+ <source>Dry suit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="396"/>
+ <source>no stop</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="398"/>
+ <location filename="../core/dive.c" line="29"/>
+ <source>deco</source>
+ <translation>deco</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="400"/>
+ <source>single ascent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="402"/>
+ <source>multiple ascent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="404"/>
+ <location filename="../core/dive.c" line="27"/>
+ <source>fresh</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="406"/>
+ <source>salt water</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="431"/>
+ <source>sight seeing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="433"/>
+ <source>club dive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="435"/>
+ <location filename="../core/dive.c" line="28"/>
+ <source>instructor</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="437"/>
+ <source>instruction</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="439"/>
+ <location filename="../core/dive.c" line="27"/>
+ <source>night</source>
+ <translation>ban đêm</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="441"/>
+ <location filename="../core/dive.c" line="25"/>
+ <source>cave</source>
+ <translation>hang động</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="443"/>
+ <location filename="../core/dive.c" line="24"/>
+ <source>ice</source>
+ <translation>băng</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="445"/>
+ <source>search</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="455"/>
+ <location filename="../core/dive.c" line="25"/>
+ <source>wreck</source>
+ <translation>vật trôi dạt</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="457"/>
+ <location filename="../core/dive.c" line="26"/>
+ <source>river</source>
+ <translation>sông</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="459"/>
+ <location filename="../core/dive.c" line="23"/>
+ <source>drift</source>
+ <translation>độ trôi</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="461"/>
+ <location filename="../core/dive.c" line="28"/>
+ <source>photo</source>
+ <translation>hình ảnh</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="463"/>
+ <source>other</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="474"/>
+ <source>Other activities</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="498"/>
+ <source>Datatrak/Wlog notes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="537"/>
+ <source>Manually entered dive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="588"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="674"/>
+ <source>Error: couldn&apos;t open the file %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="687"/>
+ <source>Error: no dive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="23"/>
+ <source>boat</source>
+ <translation>thuyền</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="23"/>
+ <source>shore</source>
+ <translation>bờ biển</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="24"/>
+ <source>deep</source>
+ <translation>sâu</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="24"/>
+ <source>cavern</source>
+ <translation>hang lớn</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="25"/>
+ <source>altitude</source>
+ <translation>độ cao so với mặt biển</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="26"/>
+ <source>pool</source>
+ <translation>ao</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="26"/>
+ <source>lake</source>
+ <translation>hồ</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="27"/>
+ <source>student</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="28"/>
+ <source>video</source>
+ <translation>video</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="33"/>
+ <source>OC-gas</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="33"/>
+ <source>diluent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="33"/>
+ <location filename="../core/equipment.c" line="88"/>
+ <location filename="../core/planner.c" line="1436"/>
+ <location filename="../core/planner.c" line="1439"/>
+ <source>oxygen</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../core/dive.c" line="181"/>
<source>pascal</source>
<translation>pascal</translation>
</message>
<message>
<location filename="../core/dive.c" line="186"/>
- <location filename="../core/qthelper.cpp" line="669"/>
+ <location filename="../core/qthelper.cpp" line="674"/>
<source>bar</source>
<translation>bar</translation>
</message>
<message>
<location filename="../core/dive.c" line="190"/>
- <location filename="../core/qthelper.cpp" line="672"/>
+ <location filename="../core/qthelper.cpp" line="677"/>
<source>psi</source>
<translation>psi</translation>
</message>
<message>
+ <location filename="../core/dive.c" line="227"/>
+ <source>ℓ</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../core/dive.c" line="232"/>
<source>cuft</source>
<translation>cuft</translation>
</message>
<message>
<location filename="../core/dive.c" line="269"/>
- <location filename="../core/qthelper.cpp" line="590"/>
- <location filename="../core/qthelper.cpp" line="605"/>
+ <location filename="../core/qthelper.cpp" line="595"/>
+ <location filename="../core/qthelper.cpp" line="610"/>
<source>m</source>
<translation>m</translation>
</message>
<message>
<location filename="../core/dive.c" line="274"/>
- <location filename="../core/qthelper.cpp" line="593"/>
- <location filename="../core/qthelper.cpp" line="607"/>
+ <location filename="../core/qthelper.cpp" line="598"/>
+ <location filename="../core/qthelper.cpp" line="612"/>
<source>ft</source>
<translation>ft</translation>
</message>
@@ -8699,53 +9123,58 @@ Maximum</source>
</message>
<message>
<location filename="../core/dive.c" line="325"/>
- <location filename="../core/qthelper.cpp" line="616"/>
- <location filename="../core/qthelper.cpp" line="626"/>
+ <location filename="../core/qthelper.cpp" line="621"/>
+ <location filename="../core/qthelper.cpp" line="631"/>
<source>lbs</source>
<translation>lbs</translation>
</message>
<message>
<location filename="../core/dive.c" line="329"/>
- <location filename="../core/qthelper.cpp" line="614"/>
- <location filename="../core/qthelper.cpp" line="624"/>
+ <location filename="../core/qthelper.cpp" line="619"/>
+ <location filename="../core/qthelper.cpp" line="629"/>
<source>kg</source>
<translation>ký</translation>
</message>
<message>
- <location filename="../core/dive.c" line="1772"/>
+ <location filename="../core/dive.c" line="1751"/>
<source>(%s) or (%s)</source>
<translation>(%s) hoặc (%s)</translation>
</message>
<message>
- <location filename="../core/divelist.c" line="484"/>
+ <location filename="../core/divelist.c" line="487"/>
<location filename="../core/equipment.c" line="84"/>
- <location filename="../core/planner.c" line="1411"/>
- <location filename="../core/planner.c" line="1414"/>
+ <location filename="../core/planner.c" line="1432"/>
+ <location filename="../core/planner.c" line="1435"/>
<source>air</source>
<translation>không khí</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="197"/>
+ <location filename="../core/equipment.c" line="86"/>
+ <source>EAN%d</source>
+ <translation>EAN%d</translation>
+ </message>
+ <message>
+ <location filename="../core/equipment.c" line="198"/>
<source>integrated</source>
<translation>được tích hợp</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="198"/>
+ <location filename="../core/equipment.c" line="199"/>
<source>belt</source>
<translation>dây ràng</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="199"/>
+ <location filename="../core/equipment.c" line="200"/>
<source>ankle</source>
<translation>mắt cá chân</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="200"/>
+ <location filename="../core/equipment.c" line="201"/>
<source>backplate weight</source>
<translation>cân nặng giáp che</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="201"/>
+ <location filename="../core/equipment.c" line="202"/>
<source>clip-on</source>
<translation>clip-on</translation>
</message>
@@ -8758,8 +9187,8 @@ Maximum</source>
<location filename="../core/file.c" line="121"/>
<location filename="../core/file.c" line="512"/>
<location filename="../core/file.c" line="597"/>
- <location filename="../core/file.c" line="924"/>
- <location filename="../core/file.c" line="1056"/>
+ <location filename="../core/file.c" line="909"/>
+ <location filename="../core/file.c" line="1092"/>
<location filename="../core/ostctools.c" line="80"/>
<source>Failed to read &apos;%s&apos;</source>
<translation>Thất bại khi đọc dữ liệu &apos;%s&apos;</translation>
@@ -8817,707 +9246,721 @@ Maximum</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/file.c" line="887"/>
- <source>No matching DC found for file &apos;%s&apos;</source>
+ <location filename="../core/git-access.c" line="134"/>
+ <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="202"/>
- <source>none</source>
- <translation>không</translation>
+ <location filename="../core/git-access.c" line="157"/>
+ <location filename="../core/git-access.c" line="177"/>
+ <source>Could not update local cache to newer remote data</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/cochran.c" line="309"/>
- <location filename="../core/cochran.c" line="315"/>
- <location filename="../core/cochran.c" line="385"/>
- <location filename="../core/libdivecomputer.c" line="202"/>
- <source>deco stop</source>
- <translation>dừng lại deco</translation>
+ <location filename="../core/git-access.c" line="170"/>
+ <source>Subsurface cloud storage corrupted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/cochran.c" line="342"/>
- <location filename="../core/file.c" line="755"/>
- <source>battery</source>
+ <location filename="../core/git-access.c" line="284"/>
+ <source>Could not update Subsurface cloud storage, try again later</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/cochran.c" line="370"/>
- <location filename="../core/cochran.c" line="409"/>
- <location filename="../core/libdivecomputer.c" line="202"/>
- <source>rbt</source>
- <translation>rbt</translation>
+ <location filename="../core/git-access.c" line="344"/>
+ <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/cochran.c" line="336"/>
- <location filename="../core/cochran.c" line="390"/>
- <location filename="../core/file.c" line="777"/>
- <location filename="../core/libdivecomputer.c" line="202"/>
- <source>ascent</source>
- <translation>đường dốc</translation>
+ <location filename="../core/git-access.c" line="374"/>
+ <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/cochran.c" line="379"/>
- <location filename="../core/cochran.c" line="426"/>
- <location filename="../core/libdivecomputer.c" line="202"/>
- <source>ceiling</source>
- <translation>trần</translation>
+ <location filename="../core/git-access.c" line="408"/>
+ <source>Remote storage and local data diverged</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="202"/>
- <source>workload</source>
- <translation>tải công việc</translation>
+ <location filename="../core/git-access.c" line="411"/>
+ <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/cochran.c" line="395"/>
- <location filename="../core/libdivecomputer.c" line="203"/>
- <source>transmitter</source>
- <translation>máy phát radio</translation>
+ <location filename="../core/git-access.c" line="420"/>
+ <source>Problems with local cache of Subsurface cloud data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/git-access.c" line="421"/>
+ <source>Moved cache data to %s. Please try the operation again.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/git-access.c" line="743"/>
+ <source>Error connecting to Subsurface cloud storage</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/git-access.c" line="746"/>
+ <source>git clone of %s failed (%s)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/libdivecomputer.c" line="210"/>
+ <location filename="../core/parse-xml.c" line="3317"/>
+ <location filename="../core/uemis-downloader.c" line="134"/>
+ <source>unknown</source>
+ <translation>chưa rõ</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="203"/>
+ <location filename="../core/libdivecomputer.c" line="223"/>
+ <source>none</source>
+ <translation>không</translation>
+ </message>
+ <message>
+ <location filename="../core/libdivecomputer.c" line="223"/>
+ <source>workload</source>
+ <translation>tải công việc</translation>
+ </message>
+ <message>
+ <location filename="../core/libdivecomputer.c" line="224"/>
<source>violation</source>
<translation>độ xâm phạm</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="203"/>
+ <location filename="../core/libdivecomputer.c" line="224"/>
<source>bookmark</source>
<translation>đánh dấu</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="203"/>
+ <location filename="../core/libdivecomputer.c" line="224"/>
<source>surface</source>
<translation>bề mặt</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="203"/>
+ <location filename="../core/libdivecomputer.c" line="224"/>
<source>safety stop</source>
<translation>dừng an toàn</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="365"/>
- <location filename="../core/cochran.c" line="414"/>
- <location filename="../core/cochran.c" line="421"/>
- <location filename="../core/file.c" line="868"/>
- <location filename="../core/libdivecomputer.c" line="204"/>
- <location filename="../core/libdivecomputer.c" line="207"/>
- <source>gaschange</source>
- <translation>thay đổi dưỡng khí</translation>
- </message>
- <message>
- <location filename="../core/libdivecomputer.c" line="204"/>
+ <location filename="../core/libdivecomputer.c" line="225"/>
<source>safety stop (voluntary)</source>
<translation>dừng an toàn (tự nguyện)</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="204"/>
+ <location filename="../core/libdivecomputer.c" line="225"/>
<source>safety stop (mandatory)</source>
<translation>dừng an toàn (bắt buộc)</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="205"/>
+ <location filename="../core/libdivecomputer.c" line="226"/>
<source>deepstop</source>
<translation>deepstop</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="205"/>
+ <location filename="../core/libdivecomputer.c" line="226"/>
<source>ceiling (safety stop)</source>
<translation>trần (độ an toàn)</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="205"/>
- <source>divetime</source>
- <translation>thời gian lặn</translation>
- </message>
- <message>
- <location filename="../core/libdivecomputer.c" line="205"/>
+ <location filename="../core/libdivecomputer.c" line="226"/>
<source>below floor</source>
<comment>event showing dive is below deco floor and adding deco time</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/cochran.c" line="353"/>
- <location filename="../core/libdivecomputer.c" line="206"/>
- <source>maxdepth</source>
- <translation>độ sâu tối đa</translation>
- </message>
- <message>
- <location filename="../core/cochran.c" line="348"/>
- <location filename="../core/libdivecomputer.c" line="206"/>
- <source>OLF</source>
- <translation>OLF</translation>
+ <location filename="../core/libdivecomputer.c" line="226"/>
+ <source>divetime</source>
+ <translation>thời gian lặn</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="206"/>
+ <location filename="../core/libdivecomputer.c" line="227"/>
<source>airtime</source>
<translation>thời gian không khí</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="206"/>
+ <location filename="../core/libdivecomputer.c" line="227"/>
<source>rgbm</source>
<translation>rgbm</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="206"/>
+ <location filename="../core/libdivecomputer.c" line="227"/>
<source>heading</source>
<translation>thẳng tiến</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="358"/>
- <location filename="../core/cochran.c" line="404"/>
- <location filename="../core/libdivecomputer.c" line="206"/>
- <source>pO₂</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/libdivecomputer.c" line="207"/>
+ <location filename="../core/libdivecomputer.c" line="228"/>
<source>tissue level warning</source>
<translation>cảnh báo cấp độ mô</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="207"/>
+ <location filename="../core/libdivecomputer.c" line="228"/>
<source>non stop time</source>
<translation>không dừng lại thời gian</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="224"/>
+ <location filename="../core/libdivecomputer.c" line="237"/>
<source>invalid event number</source>
<translation>chỉ số sự kiện không hợp lệ</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="658"/>
- <source>Unable to create parser for %s %s</source>
- <translation>Không thể tạo việc chuyển thông số cho %s %s</translation>
- </message>
- <message>
- <location filename="../core/libdivecomputer.c" line="664"/>
- <source>Error registering the data</source>
- <translation>Lỗi khi đăng ký dữ liệu</translation>
- </message>
- <message>
- <location filename="../core/libdivecomputer.c" line="495"/>
+ <location filename="../core/libdivecomputer.c" line="553"/>
<source>Error parsing the datetime</source>
<translation>Lỗi khi chuyển thông số thời gian</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="513"/>
+ <location filename="../core/libdivecomputer.c" line="571"/>
<source>Dive %d: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="519"/>
+ <location filename="../core/libdivecomputer.c" line="577"/>
<source>Error parsing the divetime</source>
<translation>Lỗi khi chuyển thông số thời gian lặn</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="529"/>
+ <location filename="../core/libdivecomputer.c" line="587"/>
<source>Error parsing the maxdepth</source>
<translation>Lỗi khi chuyển thông số độ sâu tối đa</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="548"/>
+ <location filename="../core/libdivecomputer.c" line="606"/>
<source>Error parsing temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="568"/>
+ <location filename="../core/libdivecomputer.c" line="626"/>
<source>Error parsing the gas mix count</source>
<translation>Lỗi khi chuyển tiếp thông số số lượng hỗn hợp dưỡng khí</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="580"/>
+ <location filename="../core/libdivecomputer.c" line="638"/>
<source>Error obtaining water salinity</source>
<translation>Lỗi khi thu nhận độ mặn của nước</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="589"/>
+ <location filename="../core/libdivecomputer.c" line="647"/>
<source>Error obtaining surface pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="614"/>
+ <location filename="../core/libdivecomputer.c" line="672"/>
<source>Error obtaining divemode</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="634"/>
+ <location filename="../core/libdivecomputer.c" line="692"/>
<source>Error parsing the gas mix</source>
<translation>Lỗi khi chuyển thông số hỗn hợp dưỡng khí</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="684"/>
+ <location filename="../core/libdivecomputer.c" line="717"/>
+ <source>Unable to create parser for %s %s</source>
+ <translation>Không thể tạo việc chuyển thông số cho %s %s</translation>
+ </message>
+ <message>
+ <location filename="../core/libdivecomputer.c" line="723"/>
+ <source>Error registering the data</source>
+ <translation>Lỗi khi đăng ký dữ liệu</translation>
+ </message>
+ <message>
+ <location filename="../core/libdivecomputer.c" line="744"/>
<source>Error parsing the samples</source>
<translation>Lỗi khi chuyển thông số các mẫu</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="822"/>
+ <location filename="../core/libdivecomputer.c" line="882"/>
<source>Event: waiting for user action</source>
<translation>Sự kiện: đang đợi thao tác từ người dùng</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="830"/>
+ <location filename="../core/libdivecomputer.c" line="890"/>
<source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
<translation>mô hình=%u (0x%08x), firmware=%u (0x%08x), số hiệu=%u (0x%08x)</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="894"/>
+ <location filename="../core/libdivecomputer.c" line="954"/>
<source>Error registering the event handler.</source>
<translation>Lỗi khi đăng ký quản lý sự kiện.</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="899"/>
+ <location filename="../core/libdivecomputer.c" line="959"/>
<source>Error registering the cancellation handler.</source>
<translation>Lỗi khi đăng ký việc hủy bỏ quản lý.</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="920"/>
+ <location filename="../core/libdivecomputer.c" line="980"/>
<source>Dive data import error</source>
<translation>Lỗi khi nhập dữ liệu lặn</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="959"/>
+ <location filename="../core/libdivecomputer.c" line="1019"/>
<source>Unable to create libdivecomputer context</source>
<translation>Không thể tạo nội dung cho thiết bị đo lặn</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="966"/>
+ <location filename="../core/libdivecomputer.c" line="1026"/>
<source>Unable to open %s %s (%s)</source>
<translation>Không thể mở %s %s (%s)</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="992"/>
+ <location filename="../core/libdivecomputer.c" line="1048"/>
<source>Insufficient privileges to open the device %s %s (%s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/parse-xml.c" line="517"/>
- <source>Strange percentage reading %s
+ <location filename="../core/load-git.c" line="194"/>
+ <location filename="../core/parse-xml.c" line="1242"/>
+ <source>multiple GPS locations for this dive site; also %s
</source>
- <translation>Đang đọc tỉ lệ lạ %s
-</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/load-git.c" line="194"/>
- <location filename="../core/parse-xml.c" line="1238"/>
- <source>multiple GPS locations for this dive site; also %s
+ <location filename="../core/load-git.c" line="222"/>
+ <location filename="../core/parse-xml.c" line="1304"/>
+ <source>additional name for site: %s
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/parse-xml.c" line="2044"/>
+ <location filename="../core/ostctools.c" line="120"/>
+ <location filename="../core/ostctools.c" line="152"/>
+ <source>Unknown DC in dive %d</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/ostctools.c" line="165"/>
+ <source>Error - %s - parsing dive %d</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/parse-xml.c" line="517"/>
+ <source>Strange percentage reading %s
+</source>
+ <translation>Đang đọc tỉ lệ lạ %s
+</translation>
+ </message>
+ <message>
+ <location filename="../core/parse-xml.c" line="2051"/>
<source>Failed to parse &apos;%s&apos;</source>
<translation>Thất bại khi chuyển thông số &apos;%s&apos;</translation>
</message>
<message>
- <location filename="../core/parse-xml.c" line="3741"/>
+ <location filename="../core/parse-xml.c" line="3774"/>
<source>Can&apos;t open stylesheet %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/equipment.c" line="86"/>
- <source>EAN%d</source>
- <translation>EAN%d</translation>
+ <location filename="../core/planner.c" line="555"/>
+ <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s 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 type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="1032"/>
- <location filename="../core/planner.c" line="1184"/>
- <source>Can&apos;t find gas %s</source>
+ <location filename="../core/planner.c" line="569"/>
+ <source>Decompression calculation aborted due to excessive time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="368"/>
- <source>Too many gas mixes</source>
- <translation>Quá nhiều dưỡng khí được trộn</translation>
+ <location filename="../core/planner.c" line="571"/>
+ <location filename="../core/planner.c" line="829"/>
+ <location filename="../core/planner.c" line="834"/>
+ <location filename="../core/planner.c" line="860"/>
+ <location filename="../core/planner.c" line="870"/>
+ <source>Warning:</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="568"/>
- <source>Decompression calculation aborted due to excessive time</source>
+ <location filename="../core/planner.c" line="581"/>
+ <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="592"/>
- <source>Subsurface dive plan</source>
+ <location filename="../core/planner.c" line="586"/>
+ <source>based on VPM-B at nominal conservatism</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="596"/>
- <source>depth</source>
+ <location filename="../core/planner.c" line="588"/>
+ <source>based on VPM-B at +%d conservatism</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="602"/>
- <source>runtime</source>
+ <location filename="../core/planner.c" line="590"/>
+ <source>, effective GF=%d/%d</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="594"/>
+ <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="598"/>
+ <source>Subsurface dive plan</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../core/planner.c" line="599"/>
+ <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="604"/>
+ <source>depth</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="607"/>
<source>duration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="554"/>
- <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s 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>
+ <location filename="../core/planner.c" line="610"/>
+ <source>runtime</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="605"/>
+ <location filename="../core/planner.c" line="613"/>
<source>gas</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="648"/>
+ <location filename="../core/planner.c" line="656"/>
<source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="656"/>
+ <location filename="../core/planner.c" line="664"/>
<source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="669"/>
+ <location filename="../core/planner.c" line="677"/>
<source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="676"/>
+ <location filename="../core/planner.c" line="684"/>
<source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="721"/>
+ <location filename="../core/planner.c" line="729"/>
<source>%3.0f%s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="724"/>
- <location filename="../core/planner.c" line="728"/>
+ <location filename="../core/planner.c" line="732"/>
+ <location filename="../core/planner.c" line="736"/>
<source>%3dmin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="737"/>
- <location filename="../core/planner.c" line="749"/>
+ <location filename="../core/planner.c" line="745"/>
+ <location filename="../core/planner.c" line="757"/>
<source>(SP = %.1fbar)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="772"/>
+ <location filename="../core/planner.c" line="780"/>
<source>Switch gas to %s (SP = %.1fbar)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="774"/>
+ <location filename="../core/planner.c" line="782"/>
<source>Switch gas to %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="793"/>
+ <location filename="../core/planner.c" line="801"/>
<source>CNS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="795"/>
+ <location filename="../core/planner.c" line="803"/>
<source>OTU</source>
<translation>OTU</translation>
</message>
<message>
- <location filename="../core/planner.c" line="799"/>
+ <location filename="../core/planner.c" line="807"/>
<source>Gas consumption (CCR legs excluded):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="801"/>
+ <location filename="../core/planner.c" line="809"/>
<source>Gas consumption:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="570"/>
- <location filename="../core/planner.c" line="821"/>
- <location filename="../core/planner.c" line="826"/>
- <location filename="../core/planner.c" line="851"/>
- <location filename="../core/planner.c" line="861"/>
- <source>Warning:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/planner.c" line="580"/>
- <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/planner.c" line="584"/>
- <source>based on VPM-B at nominal conservatism</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/planner.c" line="586"/>
- <source>based on VPM-B at +%d conservatism</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/planner.c" line="588"/>
- <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/planner.c" line="822"/>
+ <location filename="../core/planner.c" line="830"/>
<source>this is more gas than available in the specified cylinder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="827"/>
+ <location filename="../core/planner.c" line="835"/>
<source>not enough reserve for gas sharing on ascent!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="829"/>
+ <location filename="../core/planner.c" line="837"/>
<source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="831"/>
+ <location filename="../core/planner.c" line="839"/>
<source>%.0f%s (%.0f%s during planned ascent) of %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="848"/>
+ <location filename="../core/planner.c" line="857"/>
<source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="858"/>
+ <location filename="../core/planner.c" line="867"/>
<source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="1419"/>
+ <location filename="../core/planner.c" line="1194"/>
+ <source>Can&apos;t find gas %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="1440"/>
<source>ean</source>
<translation>ean</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1280"/>
+ <location filename="../core/profile.c" line="1298"/>
<source>@: %d:%02d
D: %.1f%s
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1283"/>
+ <location filename="../core/profile.c" line="1301"/>
<source>P: %d%s
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1287"/>
+ <location filename="../core/profile.c" line="1305"/>
<source>T: %.1f%s
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1293"/>
+ <location filename="../core/profile.c" line="1311"/>
<source>V: %.1f%s
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1296"/>
+ <location filename="../core/profile.c" line="1314"/>
<source>SAC: %.*f%s/min
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1298"/>
+ <location filename="../core/profile.c" line="1316"/>
<source>CNS: %u%%
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1300"/>
+ <location filename="../core/profile.c" line="1318"/>
<source>pO%s: %.2fbar
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1302"/>
+ <location filename="../core/profile.c" line="1320"/>
<source>pN%s: %.2fbar
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1304"/>
+ <location filename="../core/profile.c" line="1322"/>
<source>pHe: %.2fbar
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1307"/>
+ <location filename="../core/profile.c" line="1325"/>
<source>MOD: %d%s
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1314"/>
+ <location filename="../core/profile.c" line="1332"/>
<source>EAD: %d%s
EADD: %d%s
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1318"/>
+ <location filename="../core/profile.c" line="1336"/>
<source>END: %d%s
EADD: %d%s
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1331"/>
+ <location filename="../core/profile.c" line="1349"/>
<source>Safetystop: %umin @ %.0f%s
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1334"/>
+ <location filename="../core/profile.c" line="1352"/>
<source>Safetystop: unkn time @ %.0f%s
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1339"/>
+ <location filename="../core/profile.c" line="1357"/>
<source>Deco: %umin @ %.0f%s
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1342"/>
+ <location filename="../core/profile.c" line="1360"/>
<source>Deco: unkn time @ %.0f%s
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1346"/>
+ <location filename="../core/profile.c" line="1364"/>
<source>In deco
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1348"/>
+ <location filename="../core/profile.c" line="1366"/>
<source>NDL: %umin
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1351"/>
+ <location filename="../core/profile.c" line="1369"/>
<source>TTS: %umin
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1354"/>
+ <location filename="../core/profile.c" line="1372"/>
<source>Deco: %umin @ %.0f%s (calc)
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1362"/>
+ <location filename="../core/profile.c" line="1380"/>
<source>In deco (calc)
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1365"/>
+ <location filename="../core/profile.c" line="1383"/>
<source>NDL: %umin (calc)
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1367"/>
+ <location filename="../core/profile.c" line="1385"/>
<source>NDL: &gt;2h (calc)
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1371"/>
+ <location filename="../core/profile.c" line="1389"/>
<source>TTS: %umin (calc)
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1373"/>
+ <location filename="../core/profile.c" line="1391"/>
<source>TTS: &gt;2h (calc)
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1376"/>
+ <location filename="../core/profile.c" line="1394"/>
<source>RBT: %umin
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1379"/>
+ <location filename="../core/profile.c" line="1397"/>
<source>Calculated ceiling %.0f%s
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1385"/>
+ <location filename="../core/profile.c" line="1403"/>
<source>Tissue %.0fmin: %.1f%s
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1391"/>
+ <location filename="../core/profile.c" line="1409"/>
<source>heartbeat: %d
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1393"/>
+ <location filename="../core/profile.c" line="1411"/>
<source>bearing: %d
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1396"/>
+ <location filename="../core/profile.c" line="1414"/>
<source>mean depth to here %.1f%s
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1491"/>
+ <location filename="../core/profile.c" line="1515"/>
<source>%sT: %d:%02d min</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1495"/>
- <location filename="../core/profile.c" line="1499"/>
- <location filename="../core/profile.c" line="1503"/>
+ <location filename="../core/profile.c" line="1519"/>
+ <location filename="../core/profile.c" line="1523"/>
+ <location filename="../core/profile.c" line="1527"/>
<source>%s %sD:%.1f%s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1507"/>
+ <location filename="../core/profile.c" line="1531"/>
<source>%s %sD:%.1f%s
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1511"/>
+ <location filename="../core/profile.c" line="1535"/>
<source>%s%sV:%.2f%s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1515"/>
- <location filename="../core/profile.c" line="1519"/>
+ <location filename="../core/profile.c" line="1539"/>
+ <location filename="../core/profile.c" line="1543"/>
<source>%s %sV:%.2f%s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1526"/>
+ <location filename="../core/profile.c" line="1550"/>
<source>%s %sP:%d %s</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../core/profile.c" line="1575"/>
+ <source>%s SAC:%.*f %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../core/qthelper.cpp" line="67"/>
<source>%1km</source>
<translation type="unfinished"/>
@@ -9538,446 +9981,460 @@ EADD: %d%s
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="635"/>
+ <location filename="../core/qthelper.cpp" line="91"/>
+ <location filename="../core/qthelper.cpp" line="226"/>
+ <source>N</source>
+ <translation>N</translation>
+ </message>
+ <message>
+ <location filename="../core/qthelper.cpp" line="91"/>
+ <location filename="../core/qthelper.cpp" line="227"/>
+ <source>S</source>
+ <translation>S</translation>
+ </message>
+ <message>
+ <location filename="../core/qthelper.cpp" line="92"/>
+ <location filename="../core/qthelper.cpp" line="228"/>
+ <source>E</source>
+ <translation>E</translation>
+ </message>
+ <message>
+ <location filename="../core/qthelper.cpp" line="92"/>
+ <location filename="../core/qthelper.cpp" line="229"/>
+ <source>W</source>
+ <translation>W</translation>
+ </message>
+ <message>
+ <location filename="../core/qthelper.cpp" line="640"/>
<source>C</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="638"/>
+ <location filename="../core/qthelper.cpp" line="643"/>
<source>F</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/dive.c" line="23"/>
- <source>boat</source>
- <translation>thuyền</translation>
+ <location filename="../core/save-html.c" line="469"/>
+ <location filename="../core/save-html.c" line="553"/>
+ <location filename="../core/worldmap-save.c" line="111"/>
+ <source>Can&apos;t open file %s</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/dive.c" line="23"/>
- <source>shore</source>
- <translation>bờ biển</translation>
+ <location filename="../core/save-html.c" line="488"/>
+ <source>Number</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="459"/>
- <location filename="../core/dive.c" line="23"/>
- <source>drift</source>
- <translation>độ trôi</translation>
+ <location filename="../core/save-html.c" line="489"/>
+ <source>Date</source>
+ <translation>Ngày tháng</translation>
</message>
<message>
- <location filename="../core/dive.c" line="24"/>
- <source>deep</source>
- <translation>sâu</translation>
+ <location filename="../core/save-html.c" line="490"/>
+ <source>Time</source>
+ <translation>Thời gian</translation>
</message>
<message>
- <location filename="../core/dive.c" line="24"/>
- <source>cavern</source>
- <translation>hang lớn</translation>
+ <location filename="../core/save-html.c" line="491"/>
+ <source>Location</source>
+ <translation>Địa điểm</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="443"/>
- <location filename="../core/dive.c" line="24"/>
- <source>ice</source>
- <translation>băng</translation>
+ <location filename="../core/save-html.c" line="492"/>
+ <source>Air temp.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="445"/>
- <source>search</source>
+ <location filename="../core/save-html.c" line="493"/>
+ <source>Water temp.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="455"/>
- <location filename="../core/dive.c" line="25"/>
- <source>wreck</source>
- <translation>vật trôi dạt</translation>
+ <location filename="../core/save-html.c" line="494"/>
+ <source>Dives</source>
+ <translation>Lần lặn</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="441"/>
- <location filename="../core/dive.c" line="25"/>
- <source>cave</source>
- <translation>hang động</translation>
+ <location filename="../core/save-html.c" line="495"/>
+ <source>Expand all</source>
+ <translation>Mở rộng tất cả</translation>
</message>
<message>
- <location filename="../core/dive.c" line="25"/>
- <source>altitude</source>
- <translation>độ cao so với mặt biển</translation>
+ <location filename="../core/save-html.c" line="496"/>
+ <source>Collapse all</source>
+ <translation>Mở ra tất cả</translation>
</message>
<message>
- <location filename="../core/dive.c" line="26"/>
- <source>pool</source>
- <translation>ao</translation>
+ <location filename="../core/save-html.c" line="497"/>
+ <source>Trips</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/dive.c" line="26"/>
- <source>lake</source>
- <translation>hồ</translation>
+ <location filename="../core/save-html.c" line="498"/>
+ <source>Statistics</source>
+ <translation>Thống kê</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="457"/>
- <location filename="../core/dive.c" line="26"/>
- <source>river</source>
- <translation>sông</translation>
+ <location filename="../core/save-html.c" line="499"/>
+ <source>Advanced search</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="439"/>
- <location filename="../core/dive.c" line="27"/>
- <source>night</source>
- <translation>ban đêm</translation>
+ <location filename="../core/save-html.c" line="502"/>
+ <source>Rating</source>
+ <translation>Xếp hạng</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="153"/>
- <source>Error: the file does not appear to be a DATATRAK divelog</source>
- <translation type="unfinished"/>
+ <location filename="../core/save-html.c" line="503"/>
+ <source>Visibility</source>
+ <translation>Tầm nhìn</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="286"/>
- <source>clear</source>
- <translation type="unfinished"/>
+ <location filename="../core/save-html.c" line="504"/>
+ <source>Duration</source>
+ <translation>Độ dài</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="289"/>
- <source>misty</source>
- <translation type="unfinished"/>
+ <location filename="../core/save-html.c" line="505"/>
+ <source>Divemaster</source>
+ <translation>Người lặn giỏi nhất</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="292"/>
- <source>fog</source>
- <translation type="unfinished"/>
+ <location filename="../core/save-html.c" line="506"/>
+ <source>Buddy</source>
+ <translation>Bạn</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="295"/>
- <source>rain</source>
- <translation type="unfinished"/>
+ <location filename="../core/save-html.c" line="507"/>
+ <source>Suit</source>
+ <translation>Đồ lặn</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="298"/>
- <source>storm</source>
+ <location filename="../core/save-html.c" line="508"/>
+ <source>Tags</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="301"/>
- <source>snow</source>
- <translation type="unfinished"/>
+ <location filename="../core/save-html.c" line="509"/>
+ <location filename="../smtk-import/smartrak.c" line="251"/>
+ <location filename="../smtk-import/smartrak.c" line="321"/>
+ <source>Notes</source>
+ <translation>Ghi chú</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="321"/>
- <source>No suit</source>
+ <location filename="../core/save-html.c" line="510"/>
+ <source>Show more details</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="324"/>
- <source>Shorty</source>
+ <location filename="../core/save-html.c" line="513"/>
+ <source>Yearly statistics</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="327"/>
- <source>Combi</source>
- <translation type="unfinished"/>
+ <location filename="../core/save-html.c" line="514"/>
+ <source>Year</source>
+ <translation>Năm</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="330"/>
- <source>Wet suit</source>
+ <location filename="../core/save-html.c" line="515"/>
+ <source>Total time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="333"/>
- <source>Semidry suit</source>
+ <location filename="../core/save-html.c" line="516"/>
+ <source>Average time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="336"/>
- <source>Dry suit</source>
+ <location filename="../core/save-html.c" line="517"/>
+ <source>Shortest time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="396"/>
- <source>no stop</source>
+ <location filename="../core/save-html.c" line="518"/>
+ <source>Longest time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="400"/>
- <source>single ascent</source>
+ <location filename="../core/save-html.c" line="519"/>
+ <source>Average depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="402"/>
- <source>multiple ascent</source>
+ <location filename="../core/save-html.c" line="520"/>
+ <source>Min. depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="404"/>
- <location filename="../core/dive.c" line="27"/>
- <source>fresh</source>
+ <location filename="../core/save-html.c" line="521"/>
+ <source>Max. depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="406"/>
- <source>salt water</source>
+ <location filename="../core/save-html.c" line="522"/>
+ <source>Average SAC</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="431"/>
- <source>sight seeing</source>
+ <location filename="../core/save-html.c" line="523"/>
+ <source>Min. SAC</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="433"/>
- <source>club dive</source>
+ <location filename="../core/save-html.c" line="524"/>
+ <source>Max. SAC</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="437"/>
- <source>instruction</source>
+ <location filename="../core/save-html.c" line="525"/>
+ <source>Average temp.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="463"/>
- <source>other</source>
+ <location filename="../core/save-html.c" line="526"/>
+ <source>Min. temp.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="474"/>
- <source>Other activities</source>
+ <location filename="../core/save-html.c" line="527"/>
+ <source>Max. temp.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="498"/>
- <source>Datatrak/Wlog notes</source>
+ <location filename="../core/save-html.c" line="528"/>
+ <source>Back to list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="537"/>
- <source>Manually entered dive</source>
+ <location filename="../core/save-html.c" line="531"/>
+ <source>Dive No.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="588"/>
- <source>Unknown</source>
+ <location filename="../core/save-html.c" line="532"/>
+ <source>Dive profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="674"/>
- <source>Error: couldn&apos;t open the file %s</source>
+ <location filename="../core/save-html.c" line="533"/>
+ <source>Dive information</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="687"/>
- <source>Error: no dive</source>
+ <location filename="../core/save-html.c" line="534"/>
+ <source>Dive equipment</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/dive.c" line="27"/>
- <source>student</source>
+ <location filename="../core/save-html.c" line="535"/>
+ <location filename="../core/save-html.c" line="542"/>
+ <source>Type</source>
+ <translation>Loại</translation>
+ </message>
+ <message>
+ <location filename="../core/save-html.c" line="536"/>
+ <source>Size</source>
+ <translation>Kích thước</translation>
+ </message>
+ <message>
+ <location filename="../core/save-html.c" line="537"/>
+ <source>Work pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="461"/>
- <location filename="../core/dive.c" line="28"/>
- <source>photo</source>
- <translation>hình ảnh</translation>
+ <location filename="../core/save-html.c" line="538"/>
+ <source>Start pressure</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/dive.c" line="28"/>
- <source>video</source>
- <translation>video</translation>
+ <location filename="../core/save-html.c" line="539"/>
+ <source>End pressure</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="435"/>
- <location filename="../core/dive.c" line="28"/>
- <source>instructor</source>
+ <location filename="../core/save-html.c" line="540"/>
+ <source>Gas</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="398"/>
- <location filename="../core/dive.c" line="29"/>
- <source>deco</source>
- <translation>deco</translation>
+ <location filename="../core/save-html.c" line="541"/>
+ <source>Weight</source>
+ <translation>Cân nặng</translation>
</message>
<message>
- <location filename="../core/dive.c" line="33"/>
- <source>OC-gas</source>
+ <location filename="../core/save-html.c" line="543"/>
+ <source>Events</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/dive.c" line="33"/>
- <source>diluent</source>
+ <location filename="../core/save-html.c" line="544"/>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/dive.c" line="33"/>
- <location filename="../core/equipment.c" line="88"/>
- <location filename="../core/planner.c" line="1415"/>
- <location filename="../core/planner.c" line="1418"/>
- <source>oxygen</source>
+ <location filename="../core/save-html.c" line="545"/>
+ <source>Value</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/dive.c" line="227"/>
- <source>ℓ</source>
+ <location filename="../core/save-html.c" line="546"/>
+ <source>Coordinates</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/save-html.c" line="547"/>
+ <source>Dive status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/statistics.c" line="239"/>
+ <location filename="../core/statistics.c" line="242"/>
<source>more than %d days</source>
<translation>đã hơn %d ngày</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="246"/>
+ <location filename="../core/statistics.c" line="249"/>
<source>%dd %dh %dmin</source>
<translation>%dd %dh %dmin</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="249"/>
+ <location filename="../core/statistics.c" line="252"/>
<source>%dmin %dsecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/statistics.c" line="251"/>
+ <location filename="../core/statistics.c" line="254"/>
<source>%dh %dmin</source>
<translation>%dh %dmin</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="263"/>
+ <location filename="../core/statistics.c" line="266"/>
<source>for dives #</source>
<translation>cho các lần lặn #</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="269"/>
+ <location filename="../core/statistics.c" line="272"/>
<source>for selected dives</source>
<translation>cho các lần lặn được chọn</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="304"/>
+ <location filename="../core/statistics.c" line="307"/>
<source>for dive #%d</source>
<translation>cho lần lặn #%d</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="306"/>
+ <location filename="../core/statistics.c" line="309"/>
<source>for selected dive</source>
<translation>cho lần lặn được chọn</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="308"/>
+ <location filename="../core/statistics.c" line="311"/>
<source>for all dives</source>
<translation>cho mọi lần lặn</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="310"/>
+ <location filename="../core/statistics.c" line="313"/>
<source>(no dives)</source>
<translation>(không có cuộc lặn nào)</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Sun</source>
<translation>CN</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Mon</source>
<translation>T2</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Tue</source>
<translation>T3</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Wed</source>
<translation>T4</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Thu</source>
<translation>T5</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Fri</source>
<translation>T6</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Sat</source>
<translation>T7</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="129"/>
+ <location filename="../core/subsurfacestartup.c" line="134"/>
<source>Jan</source>
<translation>Th1</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="129"/>
+ <location filename="../core/subsurfacestartup.c" line="134"/>
<source>Feb</source>
<translation>Th2</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="129"/>
+ <location filename="../core/subsurfacestartup.c" line="134"/>
<source>Mar</source>
<translation>Th3</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="129"/>
+ <location filename="../core/subsurfacestartup.c" line="134"/>
<source>Apr</source>
<translation>Apr</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="129"/>
+ <location filename="../core/subsurfacestartup.c" line="134"/>
<source>May</source>
<translation>Th5</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="129"/>
+ <location filename="../core/subsurfacestartup.c" line="134"/>
<source>Jun</source>
<translation>Th6</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="130"/>
+ <location filename="../core/subsurfacestartup.c" line="135"/>
<source>Jul</source>
<translation>Th7</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="130"/>
+ <location filename="../core/subsurfacestartup.c" line="135"/>
<source>Aug</source>
<translation>Th8</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="130"/>
+ <location filename="../core/subsurfacestartup.c" line="135"/>
<source>Sep</source>
<translation>Th9</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="130"/>
+ <location filename="../core/subsurfacestartup.c" line="135"/>
<source>Oct</source>
<translation>Th10</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="130"/>
+ <location filename="../core/subsurfacestartup.c" line="135"/>
<source>Nov</source>
<translation>Th11</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="130"/>
+ <location filename="../core/subsurfacestartup.c" line="135"/>
<source>Dec</source>
<translation>Th12</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="191"/>
- <location filename="../core/parse-xml.c" line="3284"/>
- <location filename="../core/uemis-downloader.c" line="134"/>
- <source>unknown</source>
- <translation>chưa rõ</translation>
- </message>
- <message>
- <location filename="../core/uemis-downloader.c" line="467"/>
- <source>data</source>
- <translation>dữ liệu</translation>
- </message>
- <message>
- <location filename="../core/uemis-downloader.c" line="447"/>
- <source>%s %s</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../core/uemis-downloader.c" line="27"/>
<source>Uemis Zurich: the file system is almost full.
Disconnect/reconnect the dive computer
@@ -10003,6 +10460,16 @@ Is the Uemis Zurich plugged in correctly?</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../core/uemis-downloader.c" line="447"/>
+ <source>%s %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/uemis-downloader.c" line="467"/>
+ <source>data</source>
+ <translation>dữ liệu</translation>
+ </message>
+ <message>
<location filename="../core/uemis-downloader.c" line="495"/>
<source>divelog #</source>
<translation type="unfinished"/>
@@ -10173,281 +10640,6 @@ Is the Uemis Zurich plugged in correctly?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/save-html.c" line="469"/>
- <location filename="../core/save-html.c" line="553"/>
- <location filename="../core/worldmap-save.c" line="111"/>
- <source>Can&apos;t open file %s</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="488"/>
- <source>Number</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="489"/>
- <source>Date</source>
- <translation>Ngày tháng</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="490"/>
- <source>Time</source>
- <translation>Thời gian</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="491"/>
- <source>Location</source>
- <translation>Địa điểm</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="492"/>
- <source>Air temp.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="493"/>
- <source>Water temp.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="498"/>
- <source>Statistics</source>
- <translation>Thống kê</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="502"/>
- <source>Rating</source>
- <translation>Xếp hạng</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="503"/>
- <source>Visibility</source>
- <translation>Tầm nhìn</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="504"/>
- <source>Duration</source>
- <translation>Độ dài</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="494"/>
- <source>Dives</source>
- <translation>Lần lặn</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="495"/>
- <source>Expand all</source>
- <translation>Mở rộng tất cả</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="496"/>
- <source>Collapse all</source>
- <translation>Mở ra tất cả</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="497"/>
- <source>Trips</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="499"/>
- <source>Advanced search</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="505"/>
- <source>Divemaster</source>
- <translation>Người lặn giỏi nhất</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="506"/>
- <source>Buddy</source>
- <translation>Bạn</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="507"/>
- <source>Suit</source>
- <translation>Đồ lặn</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="508"/>
- <source>Tags</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="509"/>
- <location filename="../smtk-import/smartrak.c" line="251"/>
- <location filename="../smtk-import/smartrak.c" line="321"/>
- <source>Notes</source>
- <translation>Ghi chú</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="510"/>
- <source>Show more details</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="513"/>
- <source>Yearly statistics</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="514"/>
- <source>Year</source>
- <translation>Năm</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="515"/>
- <source>Total time</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="516"/>
- <source>Average time</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="517"/>
- <source>Shortest time</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="518"/>
- <source>Longest time</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="519"/>
- <source>Average depth</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="520"/>
- <source>Min. depth</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="521"/>
- <source>Max. depth</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="523"/>
- <source>Min. SAC</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="524"/>
- <source>Max. SAC</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="525"/>
- <source>Average temp.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="526"/>
- <source>Min. temp.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="527"/>
- <source>Max. temp.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="528"/>
- <source>Back to list</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="534"/>
- <source>Dive equipment</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="537"/>
- <source>Work pressure</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="538"/>
- <source>Start pressure</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="539"/>
- <source>End pressure</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="547"/>
- <source>Dive status</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="522"/>
- <source>Average SAC</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="531"/>
- <source>Dive No.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="532"/>
- <source>Dive profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="533"/>
- <source>Dive information</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="535"/>
- <location filename="../core/save-html.c" line="542"/>
- <source>Type</source>
- <translation>Loại</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="536"/>
- <source>Size</source>
- <translation>Kích thước</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="540"/>
- <source>Gas</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="541"/>
- <source>Weight</source>
- <translation>Cân nặng</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="543"/>
- <source>Events</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="544"/>
- <source>Name</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="545"/>
- <source>Value</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/save-html.c" line="546"/>
- <source>Coordinates</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../core/worldmap-save.c" line="39"/>
<source>Date:</source>
<translation>Ngày tháng:</translation>
@@ -10493,109 +10685,6 @@ Is the Uemis Zurich plugged in correctly?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="91"/>
- <location filename="../core/qthelper.cpp" line="226"/>
- <source>N</source>
- <translation>N</translation>
- </message>
- <message>
- <location filename="../core/qthelper.cpp" line="91"/>
- <location filename="../core/qthelper.cpp" line="227"/>
- <source>S</source>
- <translation>S</translation>
- </message>
- <message>
- <location filename="../core/qthelper.cpp" line="92"/>
- <location filename="../core/qthelper.cpp" line="228"/>
- <source>E</source>
- <translation>E</translation>
- </message>
- <message>
- <location filename="../core/qthelper.cpp" line="92"/>
- <location filename="../core/qthelper.cpp" line="229"/>
- <source>W</source>
- <translation>W</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="341"/>
- <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/git-access.c" line="134"/>
- <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/git-access.c" line="157"/>
- <location filename="../core/git-access.c" line="177"/>
- <source>Could not update local cache to newer remote data</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/git-access.c" line="170"/>
- <source>Subsurface cloud storage corrupted</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/git-access.c" line="285"/>
- <source>Could not update Subsurface cloud storage, try again later</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/git-access.c" line="371"/>
- <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/git-access.c" line="405"/>
- <source>Remote storage and local data diverged</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/git-access.c" line="408"/>
- <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/git-access.c" line="417"/>
- <source>Problems with local cache of Subsurface cloud data</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/git-access.c" line="418"/>
- <source>Moved cache data to %s. Please try the operation again.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/git-access.c" line="737"/>
- <source>Error connecting to Subsurface cloud storage</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/git-access.c" line="740"/>
- <source>git clone of %s failed (%s)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/load-git.c" line="222"/>
- <location filename="../core/parse-xml.c" line="1300"/>
- <source>additional name for site: %s
-</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/ostctools.c" line="120"/>
- <location filename="../core/ostctools.c" line="152"/>
- <source>Unknown DC in dive %d</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/ostctools.c" line="165"/>
- <source>Error - %s - parsing dive %d</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../smtk-import/smartrak.c" line="247"/>
<source>Built</source>
<translation type="unfinished"/>
@@ -10679,155 +10768,120 @@ Is the Uemis Zurich plugged in correctly?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="103"/>
<source>Subsurface</source>
<translation>Subsurface</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="110"/>
<source>Dive list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="125"/>
<source>Cloud credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="139"/>
<source>Manage dives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="141"/>
<source>Add dive manually</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="149"/>
<source>Manual sync with cloud</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="167"/>
<source>Offline mode</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="167"/>
<source>Enable auto cloud sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="187"/>
<source>GPS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="190"/>
<source>GPS-tag dives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="197"/>
<source>Upload GPS data</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="204"/>
<source>Download GPS data</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="211"/>
<source>Show GPS fixes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="220"/>
<source>Clear GPS cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="226"/>
<source>Preferences</source>
<translation>Tùy biến</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="237"/>
<source>Developer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="239"/>
<source>App log</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="246"/>
<source>Theme information</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="253"/>
<source>User manual</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="259"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="304"/>
<source>Run location service</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="304"/>
<source>No GPS source available</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="316"/>
<source>Actions</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
- <source>Hello World</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
- <source>File</source>
- <translation>Tập tin</translation>
- </message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
- <source>&amp;Open</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
- <source>Exit</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
- <source>Button 1 pressed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
- <source>Button 2 pressed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
- <source>May I have your attention, please?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>plannerDetails</name>
@@ -10901,6 +10955,24 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+ <location filename="../build/ui_plannerSettings.h" line="425"/>
+ <source>75% to 50% avg. depth</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+ <location filename="../build/ui_plannerSettings.h" line="427"/>
+ <source>50% avg. depth to 6m</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+ <location filename="../build/ui_plannerSettings.h" line="429"/>
+ <source>6m to surface</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
<location filename="../build/ui_plannerSettings.h" line="431"/>
<source>Descent</source>
@@ -10924,12 +10996,35 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+ <source>Bühlmann deco</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
<location filename="../build/ui_plannerSettings.h" line="445"/>
<source>Reserve gas</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+ <location filename="../build/ui_plannerSettings.h" line="446"/>
+ <location filename="../build/ui_plannerSettings.h" line="459"/>
+ <location filename="../build/ui_plannerSettings.h" line="461"/>
+ <source>bar</source>
+ <translation>bar</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+ <location filename="../build/ui_plannerSettings.h" line="437"/>
+ <location filename="../build/ui_plannerSettings.h" line="440"/>
+ <source>%</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
<location filename="../build/ui_plannerSettings.h" line="449"/>
<source>Postpone gas change if a stop is not required</source>
@@ -10948,11 +11043,9 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
- <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
- <location filename="../build/ui_plannerSettings.h" line="437"/>
- <location filename="../build/ui_plannerSettings.h" line="440"/>
- <source>%</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+ <location filename="../build/ui_plannerSettings.h" line="436"/>
+ <source>Plan backgas breaks</source>
<translation type="unfinished"/>
</message>
<message>
@@ -10962,10 +11055,10 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
- <location filename="../build/ui_plannerSettings.h" line="441"/>
- <source>Drop to first depth</source>
- <translation type="unfinished"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+ <location filename="../build/ui_plannerSettings.h" line="453"/>
+ <source>min</source>
+ <translation>nhỏ nhất</translation>
</message>
<message>
<location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -10974,162 +11067,138 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
- <location filename="../build/ui_plannerSettings.h" line="436"/>
- <source>Plan backgas breaks</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+ <source>Maximize bottom time allowed by gas and no decompression limits</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
- <location filename="../build/ui_plannerSettings.h" line="455"/>
- <source>Gas options</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+ <location filename="../build/ui_plannerSettings.h" line="443"/>
+ <source>Recreational mode</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
- <location filename="../build/ui_plannerSettings.h" line="456"/>
- <source>Bottom SAC</source>
- <translation>SAC</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
- <location filename="../build/ui_plannerSettings.h" line="457"/>
- <source>Deco SAC</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+ <location filename="../build/ui_plannerSettings.h" line="441"/>
+ <source>Drop to first depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
- <location filename="../build/ui_plannerSettings.h" line="458"/>
- <source>Bottom pO₂</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+ <location filename="../build/ui_plannerSettings.h" line="452"/>
+ <source>Min. switch duration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
- <location filename="../build/ui_plannerSettings.h" line="460"/>
- <source>Deco pO₂</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+ <location filename="../build/ui_plannerSettings.h" line="444"/>
+ <source>Safety stop</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
- <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
- <location filename="../build/ui_plannerSettings.h" line="462"/>
- <location filename="../build/ui_plannerSettings.h" line="463"/>
- <source>ℓ/min</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+ <source>Conservatism level</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
- <location filename="../build/ui_plannerSettings.h" line="468"/>
- <source>Display runtime</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+ <location filename="../build/ui_plannerSettings.h" line="455"/>
+ <source>Gas options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
- <location filename="../build/ui_plannerSettings.h" line="472"/>
- <source>Display segment duration</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
+ <location filename="../build/ui_plannerSettings.h" line="462"/>
+ <location filename="../build/ui_plannerSettings.h" line="463"/>
+ <source>ℓ/min</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
- <location filename="../build/ui_plannerSettings.h" line="476"/>
- <source>Display transitions in deco</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+ <source>m</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
- <location filename="../build/ui_plannerSettings.h" line="477"/>
- <source>Verbatim dive plan</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+ <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
- <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
- <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
- <location filename="../build/ui_plannerSettings.h" line="446"/>
- <location filename="../build/ui_plannerSettings.h" line="459"/>
- <location filename="../build/ui_plannerSettings.h" line="461"/>
- <source>bar</source>
- <translation>bar</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+ <location filename="../build/ui_plannerSettings.h" line="456"/>
+ <source>Bottom SAC</source>
+ <translation>SAC</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
- <location filename="../build/ui_plannerSettings.h" line="425"/>
- <source>75% to 50% avg. depth</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+ <location filename="../build/ui_plannerSettings.h" line="458"/>
+ <source>Bottom pO₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
- <location filename="../build/ui_plannerSettings.h" line="427"/>
- <source>50% avg. depth to 6m</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+ <source>Best mix END</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
- <location filename="../build/ui_plannerSettings.h" line="429"/>
- <source>6m to surface</source>
- <translation type="unfinished"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
+ <location filename="../build/ui_plannerSettings.h" line="464"/>
+ <source>Notes</source>
+ <translation>Ghi chú</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
- <source>Bühlmann deco</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
+ <location filename="../build/ui_plannerSettings.h" line="466"/>
+ <source>In dive plan, show runtime (absolute time) of stops</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
- <location filename="../build/ui_plannerSettings.h" line="453"/>
- <source>min</source>
- <translation>nhỏ nhất</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
- <source>Maximize bottom time allowed by gas and no decompression limits</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+ <location filename="../build/ui_plannerSettings.h" line="468"/>
+ <source>Display runtime</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
- <location filename="../build/ui_plannerSettings.h" line="443"/>
- <source>Recreational mode</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
+ <location filename="../build/ui_plannerSettings.h" line="470"/>
+ <source>In dive plan, show duration (relative time) of stops</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
- <location filename="../build/ui_plannerSettings.h" line="452"/>
- <source>Min. switch duration</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+ <location filename="../build/ui_plannerSettings.h" line="472"/>
+ <source>Display segment duration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
- <location filename="../build/ui_plannerSettings.h" line="444"/>
- <source>Safety stop</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
+ <location filename="../build/ui_plannerSettings.h" line="474"/>
+ <source>In diveplan, list transitions or treat them as implicit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
- <source>Conservatism level</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+ <location filename="../build/ui_plannerSettings.h" line="476"/>
+ <source>Display transitions in deco</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
- <location filename="../build/ui_plannerSettings.h" line="464"/>
- <source>Notes</source>
- <translation>Ghi chú</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
- <location filename="../build/ui_plannerSettings.h" line="466"/>
- <source>In dive plan, show runtime (absolute time) of stops</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+ <location filename="../build/ui_plannerSettings.h" line="477"/>
+ <source>Verbatim dive plan</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
- <location filename="../build/ui_plannerSettings.h" line="470"/>
- <source>In dive plan, show duration (relative time) of stops</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+ <location filename="../build/ui_plannerSettings.h" line="460"/>
+ <source>Deco pO₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
- <location filename="../build/ui_plannerSettings.h" line="474"/>
- <source>In diveplan, list transitions or treat them as implicit</source>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+ <location filename="../build/ui_plannerSettings.h" line="457"/>
+ <source>Deco SAC</source>
<translation type="unfinished"/>
</message>
</context>