Pull latest translations from Transifex

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

1 files changed, 1850 insertions, 1768 deletions

diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts
index dd9e1ce84..1182757aa 100644
--- a/translations/subsurface_zh_TW.ts
+++ b/translations/subsurface_zh_TW.ts
@@ -3,35 +3,43 @@
     <name>About</name>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="10"/>
-        <location filename="../mobile-widgets/qml/About.qml" line="19"/>
+        <location filename="../mobile-widgets/qml/About.qml" line="20"/>
         <source>About Subsurface-mobile</source>
         <translation>關於 Subsurface-mobile</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/About.qml" line="36"/>
+        <location filename="../mobile-widgets/qml/About.qml" line="37"/>
         <source>A mobile version of the free Subsurface divelog software.
 </source>
         <translation>Subsurface免費日誌軟體的行動裝置版本.
 </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/About.qml" line="37"/>
+        <location filename="../mobile-widgets/qml/About.qml" line="38"/>
         <source>View your dive logs while on the go.</source>
         <translation>旅途中查看潛水日誌.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/About.qml" line="48"/>
+        <location filename="../mobile-widgets/qml/About.qml" line="49"/>
         <source>Version: %1
 
 © Subsurface developer team
 2011-2018</source>
+        <translation>版本: %1
+
+© Subsurface developer team
+2011-2018</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/About.qml" line="62"/>
+        <source>Copy logs to clipboard</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>BackButton</name>
     <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="54"/>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="51"/>
         <source>Navigate Back</source>
         <translation>導航返回</translation>
     </message>
@@ -320,12 +328,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="547"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/>
         <source>Person: </source>
         <translation>人名: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="548"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="546"/>
         <source>Searches for buddies and divemasters</source>
         <translation>搜尋潛伴與潛導</translation>
     </message>
@@ -333,7 +341,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="287"/>
+        <location filename="../qt-models/filtermodels.cpp" line="279"/>
         <source>No buddies</source>
         <translation>無潛伴</translation>
     </message>
@@ -397,7 +405,7 @@
 <context>
     <name>CloudStorageAuthenticate</name>
     <message>
-        <location filename="../core/cloudstorage.cpp" line="65"/>
+        <location filename="../core/cloudstorage.cpp" line="64"/>
         <source>Cloud account verification required, enter PIN in preferences</source>
         <translation>雲端帳號需要認證, 請於設置頁面輸入密碼</translation>
     </message>
@@ -487,7 +495,7 @@
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/>
         <source>Tags</source>
-        <translation type="unfinished"/>
+        <translation>標籤</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/>
@@ -574,6 +582,16 @@
         <source>Sample setpoint</source>
         <translation>取樣設定點</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="52"/>
+        <source>Visibility</source>
+        <translation>能見度</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="52"/>
+        <source>Rating</source>
+        <translation>評分</translation>
+    </message>
 </context>
 <context>
     <name>ConfigureDiveComputer</name>
@@ -613,7 +631,7 @@
         <translation>無法建立 libdivecomputer 上下文</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="659"/>
+        <location filename="../core/configuredivecomputer.cpp" line="647"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>無法與潛水電腦建立連線</translation>
     </message>
@@ -696,1039 +714,1050 @@
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="241"/>
         <source>Suunto Vyper family</source>
         <translation>Suunto Vyper家族</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="241"/>
         <source>OSTC 4</source>
         <translation>OSTC 4</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="262"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1570"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1946"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2878"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1194"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2492"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3567"/>
         <source>Basic settings</source>
         <translation>基本設定</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="269"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2885"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1201"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2499"/>
         <source>Eco</source>
         <translation>Eco</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="274"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2890"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2504"/>
         <source>Medium</source>
         <translation>中</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="279"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2895"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1211"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2509"/>
         <source>High</source>
         <translation>高</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="287"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="835"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="858"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="884"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="936"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1002"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1028"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1110"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1126"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1459"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2287"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="707"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="733"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="759"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="799"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="822"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1219"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1767"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1790"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1868"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1934"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1960"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2058"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2391"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2417"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2443"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2483"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2506"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2903"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3274"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3318"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3341"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3377"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3455"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2517"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2888"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2932"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2955"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2991"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3069"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="298"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2914"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1230"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2528"/>
         <source>English</source>
         <translation>English</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="303"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2919"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2533"/>
         <source>German</source>
         <translation>German</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="308"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2924"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2538"/>
         <source>French</source>
         <translation>French</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2929"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1245"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2543"/>
         <source>Italian</source>
         <translation>Italian</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="322"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2938"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1254"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>m/°C</source>
         <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="327"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2943"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1259"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2557"/>
         <source>ft/°F</source>
         <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="335"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1665"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1952"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2951"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="268"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1267"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2565"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3662"/>
         <source>Serial No.</source>
         <translation>序號</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="358"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1688"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1989"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2974"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="305"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1290"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2588"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3685"/>
         <source>Firmware version</source>
         <translation>韌體版本</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="369"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2985"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1301"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2599"/>
         <source>MMDDYY</source>
         <translation>MMDDYY</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="374"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2990"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1306"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2604"/>
         <source>DDMMYY</source>
         <translation>DDMMYY</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="379"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2995"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1311"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2609"/>
         <source>YYMMDD</source>
         <translation>YYMMDD</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="394"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3010"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2624"/>
         <source>Language</source>
         <translation>語言</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="404"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2072"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3020"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="388"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1336"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2634"/>
         <source>Date format</source>
         <translation>日期格式</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="414"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3030"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1346"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2644"/>
         <source>Brightness</source>
         <translation>亮度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="424"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1859"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3040"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1356"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3856"/>
         <source>Units</source>
         <translation>單位</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3050"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1366"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2664"/>
         <source>Salinity (0-5%)</source>
         <translation>鹽度 (0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="447"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3063"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1379"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2677"/>
         <source>Reset device to default settings</source>
         <translation>重置裝置至原始設定</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="461"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1393"/>
         <source>230LSB/Gauss</source>
         <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="466"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1398"/>
         <source>330LSB/Gauss</source>
         <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="471"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1403"/>
         <source>390LSB/Gauss</source>
         <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="476"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1408"/>
         <source>440LSB/Gauss</source>
         <translation>440LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="481"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1413"/>
         <source>660LSB/Gauss</source>
         <translation>660LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="486"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1418"/>
         <source>820LSB/Gauss</source>
         <translation>820LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="491"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1423"/>
         <source>1090LSB/Gauss</source>
         <translation>1090LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="496"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1428"/>
         <source>1370LSB/Gauss</source>
         <translation>1370LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="530"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1462"/>
         <source>Compass gain</source>
         <translation>羅盤增益</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="540"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1808"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3096"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1472"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2710"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3805"/>
         <source>Computer model</source>
         <translation>電腦模型</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="547"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1722"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1999"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3103"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="315"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1479"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2717"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3719"/>
         <source>Custom text</source>
         <translation>自訂文字格式</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="565"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3121"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1497"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2735"/>
         <source>OC</source>
         <translation>OC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="570"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3126"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1502"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2740"/>
         <source>CC</source>
         <translation>CC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="575"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2345"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3131"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1507"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2745"/>
         <source>Gauge</source>
         <translation>Gauge</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="580"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2355"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3136"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1512"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2750"/>
         <source>Apnea</source>
         <translation>Apnea</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="588"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3144"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2758"/>
         <source>Dive mode</source>
         <translation>潛水模式</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="599"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1531"/>
         <source>2s</source>
         <translation>2s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="604"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1536"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3775"/>
         <source>10s</source>
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="612"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2043"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1544"/>
         <source>Sampling rate</source>
         <translation>取樣速率</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="623"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3155"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1555"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2769"/>
         <source>Standard</source>
         <translation>標準</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="628"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3160"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1560"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2774"/>
         <source>Red</source>
         <translation>紅色</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="633"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3165"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1565"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2779"/>
         <source>Green</source>
         <translation>綠色</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="638"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3170"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1570"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2784"/>
         <source>Blue</source>
         <translation>藍色</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="646"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3178"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="417"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1578"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2792"/>
         <source>Sync dive computer time with PC</source>
         <translation>同步潛水電腦時間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="653"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3185"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1585"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2799"/>
         <source>Dive mode color</source>
         <translation>潛水模式顏色</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="663"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2029"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3195"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="345"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1595"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2809"/>
         <source>Show safety stop</source>
         <translation>顯示安全停留</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="670"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2154"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="470"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1602"/>
         <source>End Depth</source>
         <translation>結束深度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="680"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2171"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3205"/>
-        <source> s</source>
-        <translation> s</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="696"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1962"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3221"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1628"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2835"/>
         <source>Length</source>
         <translation>長度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="703"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2147"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="463"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1635"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2842"/>
         <source>Start Depth</source>
         <translation>起始深度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="710"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2161"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1642"/>
         <source>Reset Depth</source>
         <translation>重設深度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="720"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="745"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="767"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="913"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2190"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2215"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2237"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2316"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3238"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3357"/>
-        <source> m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="787"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2257"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3261"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="573"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1719"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2875"/>
         <source>Advanced settings</source>
         <translation>進階設定</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="793"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1725"/>
         <source>Left button sensitivity</source>
         <translation>左邊按鈕靈敏度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="800"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3553"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1732"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3167"/>
         <source>Always show pO₂</source>
         <translation>永遠顯示 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="807"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2263"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1739"/>
         <source>Alt GF can be selected underwater</source>
         <translation>可在水下選取Alt GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="814"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2280"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3297"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="596"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1746"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2911"/>
         <source>Future TTS</source>
         <translation>未來TTS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="821"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3304"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2918"/>
         <source>Pressure sensor offset</source>
         <translation>壓力感測器位移</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="828"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2499"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3311"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="815"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1760"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2925"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="851"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2476"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3334"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="792"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1783"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2948"/>
         <source>GFHigh</source>
         <translation>GFhigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="874"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2270"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="586"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1806"/>
         <source>Desaturation</source>
         <translation>未飽和</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="926"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2329"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3370"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="645"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1858"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2984"/>
         <source>Decotype</source>
         <translation>減壓模式</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="952"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3393"/>
-        <source> mbar</source>
-        <translation> mbar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="969"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2340"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3410"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1901"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3024"/>
         <source>ZH-L16</source>
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="974"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1906"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3029"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="982"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2378"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3428"/>
-        <source> min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="992"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2407"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3438"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="723"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1924"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3052"/>
         <source>Last deco</source>
         <translation>最後減壓</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1018"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2433"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3448"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="749"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1950"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3062"/>
         <source>Alt GFLow</source>
         <translation>Alt GF低</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1044"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2459"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3471"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="775"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1976"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3085"/>
         <source>Alt GFHigh</source>
         <translation>Alt GF高</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1051"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2466"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="782"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1983"/>
         <source>Saturation</source>
         <translation>飽和</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1061"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1993"/>
         <source>Flip screen</source>
         <translation>翻轉螢幕</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1068"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2000"/>
         <source>Right button sensitivity</source>
         <translation>右邊按鈕靈敏度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1075"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2007"/>
         <source>MOD warning</source>
         <translation>MOD 警示</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1082"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2522"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="838"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2014"/>
         <source>Graphical speed indicator</source>
         <translation>圖形化速度指示器</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1089"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2021"/>
         <source>Dynamic ascent rate</source>
         <translation>動態上升速率</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1096"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2561"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3478"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="877"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2028"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3092"/>
         <source>Bottom gas consumption</source>
         <translation>置底氣體消耗</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1103"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2568"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3485"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="884"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2035"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3099"/>
         <source>Deco gas consumption</source>
         <translation>減壓氣體消耗</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1142"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1158"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2529"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2545"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3492"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3508"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3524"/>
-        <source> ℓ/min</source>
-        <translation>ℓ/min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1174"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3580"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2106"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3194"/>
         <source>Temperature sensor offset</source>
         <translation>溫度感測器位移</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3587"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3201"/>
         <source>°C</source>
         <translation>°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1201"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2576"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3607"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="892"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3221"/>
         <source>Gas settings</source>
         <translation>氣體設定</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1244"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1329"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2619"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2704"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3650"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3735"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC Mk2/2N/2C</source>
+        <translation>OSTC Mk2/2N/2C</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <source>OSTC 2/3/Sport/Plus/cR</source>
+        <translation>OSTC 2/3/Sport/Plus/cR</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="506"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="553"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="632"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1652"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1677"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1699"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1845"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2852"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2971"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="845"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="861"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2090"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3106"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3122"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3138"/>
+        <source>ℓ/min</source>
+        <translation>ℓ/min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="935"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1020"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2176"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3264"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3349"/>
         <source>%O₂</source>
         <translation>%O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1249"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1334"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2624"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2709"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3655"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3740"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="940"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1025"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2266"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3354"/>
         <source>%He</source>
         <translation>%He</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1254"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1339"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2629"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2714"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3660"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3745"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="945"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1030"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2186"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3359"/>
         <source>Type</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1259"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1344"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1419"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2634"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2719"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2784"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3665"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3750"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3825"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="950"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1035"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1100"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2191"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2276"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3279"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3364"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3439"/>
         <source>Change depth</source>
         <translation>變更深度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1264"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2639"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3670"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="955"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2196"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3284"/>
         <source>Gas 1</source>
         <translation>Gas 1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1269"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2644"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3675"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2201"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3289"/>
         <source>Gas 2</source>
         <translation>Gas 2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1274"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2649"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3680"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3294"/>
         <source>Gas 3</source>
         <translation>Gas 3</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1279"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3685"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="970"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2211"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3299"/>
         <source>Gas 4</source>
         <translation>Gas 4</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1284"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2659"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3690"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="975"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2216"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3304"/>
         <source>Gas 5</source>
         <translation>Gas 5</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2724"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3755"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1040"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2281"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3369"/>
         <source>Dil 1</source>
         <translation>Dil 1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1354"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2729"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3760"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1045"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2286"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3374"/>
         <source>Dil 2</source>
         <translation>Dil 2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1359"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2734"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3765"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1050"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2291"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3379"/>
         <source>Dil 3</source>
         <translation>Dil 3</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1364"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2739"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3770"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1055"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3384"/>
         <source>Dil 4</source>
         <translation>Dil 4</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1369"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2744"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3775"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1060"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2301"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3389"/>
         <source>Dil 5</source>
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1414"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2779"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3820"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1095"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3434"/>
         <source>Setpoint</source>
         <translation>Setpoint</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1424"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2789"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3830"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1105"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2356"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3444"/>
         <source>SP 1</source>
         <translation>SP 1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1429"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2794"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3835"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1110"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2361"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3449"/>
         <source>SP 2</source>
         <translation>SP 2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2799"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3840"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1115"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2366"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3454"/>
         <source>SP 3</source>
         <translation>SP 3</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1439"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3845"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1136"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1152"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3509"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3525"/>
+        <source>cbar</source>
+        <translation>cbar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1884"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3007"/>
+        <source>mbar</source>
+        <translation>mbar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2371"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3459"/>
         <source>SP 4</source>
         <translation>SP 4</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1444"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3850"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2376"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3464"/>
         <source>SP 5</source>
         <translation>SP 5</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1452"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2384"/>
         <source>O₂ in calibration gas</source>
         <translation>校正氣體的O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1476"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3859"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3473"/>
         <source>Fixed setpoint</source>
         <translation>Fixed setpoint</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1481"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3864"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2413"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3478"/>
         <source>Sensor</source>
         <translation>感測器</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1489"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3872"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3486"/>
         <source>Setpoint fallback</source>
         <translation>Setpoint fallback</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1512"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1528"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2820"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2836"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3895"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3911"/>
-        <source> cbar</source>
-        <translation> cbar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1544"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2852"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1168"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2466"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3541"/>
         <source>pO₂ max</source>
         <translation>pO₂ max</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1551"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2859"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3934"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1175"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2473"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3548"/>
         <source>pO₂ min</source>
         <translation>pO₂ min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1592"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3589"/>
         <source>Safety level</source>
         <translation>安全等級</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1618"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3615"/>
         <source>Altitude range</source>
         <translation>海拔範圍</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1625"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3622"/>
         <source>Model</source>
         <translation>型號</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1645"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2022"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="338"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3642"/>
         <source>Number of dives</source>
         <translation>潛水編號</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1705"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3702"/>
         <source>Max. depth</source>
         <translation>最大深度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1752"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3749"/>
         <source>P0 (none)</source>
         <extracomment>Suunto safety level</extracomment>
         <translation>P0 (無)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1757"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3754"/>
         <source>P1 (medium)</source>
         <extracomment>Suunto safety level</extracomment>
         <translation>P1 (普通)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1762"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3759"/>
         <source>P2 (high)</source>
         <extracomment>Suunto safety level</extracomment>
         <translation>P2 (高)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1770"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3767"/>
         <source>Sample rate</source>
         <translation>取樣頻率</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1783"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3780"/>
         <source>20s</source>
         <translation>20s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1788"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3785"/>
         <source>30s</source>
         <translation>30s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1793"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3790"/>
         <source>60s</source>
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1801"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3798"/>
         <source>Total dive time</source>
         <translation>總潛水時間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1825"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1917"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1914"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3822"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3914"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1839"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3836"/>
         <source>24h</source>
         <translation>24h</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1844"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3841"/>
         <source>12h</source>
         <translation>12h</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1852"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3849"/>
         <source>Time format</source>
         <translation>時間格式</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1867"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3864"/>
         <source>Imperial</source>
         <translation>英制</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1872"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3869"/>
         <source>Metric</source>
         <translation>公制</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1883"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1612"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2819"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3880"/>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1890"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3887"/>
         <source>Light</source>
         <translation>Light</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1907"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3904"/>
         <source>Depth alarm</source>
         <translation>深度警示</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3924"/>
         <source>Time alarm</source>
         <translation>時間警示</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2083"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="399"/>
         <source>MM/DD/YY</source>
         <translation>MM/DD/YY</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2088"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="404"/>
         <source>DD/MM/YY</source>
         <translation>DD/MM/YY</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2093"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="409"/>
         <source>YY/MM/DD</source>
         <translation>YY/MM/DD</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2108"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="424"/>
         <source>Salinity</source>
         <translation>鹽度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2118"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="434"/>
         <source>kg/ℓ</source>
         <translation>kg/ℓ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2350"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="666"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2360"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="676"/>
         <source>L16-GF OC</source>
         <translation>L16-GF OC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2365"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="681"/>
         <source>L16-GF CC</source>
         <translation>L16-GF CC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2370"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="686"/>
         <source>PSCR-GF</source>
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3267"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2881"/>
         <source>Travel gas consumption</source>
         <translation>氣體消耗</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3290"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2904"/>
         <source>Button sensitivity</source>
         <translation>按鈕靈敏度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3420"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3034"/>
         <source>VPM</source>
         <translation>VPM</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3560"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3174"/>
         <source>VPM conservatism</source>
         <translation>VPM conservatism</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3567"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3181"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/>
+        <source>Error</source>
+        <translation>錯誤</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/>
         <source>Backup dive computer settings</source>
         <translation>備份潛水電腦設定</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/>
         <source>Backup files</source>
         <translation>備份檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/>
         <source>XML backup error</source>
         <translation>XML備份錯誤</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>儲存備份檔案時發生錯誤。
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/>
         <source>Backup succeeded</source>
         <translation>備份成功</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/>
         <source>Your settings have been saved to: %1</source>
         <translation>設定會儲存至：%1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/>
         <source>Restore dive computer settings</source>
         <translation>還原潛水電腦設定</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/>
         <source>XML restore error</source>
         <translation>XML還原錯誤</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>還原備份檔案時發生錯誤。
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/>
         <source>Restore succeeded</source>
         <translation>還原成功</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/>
         <source>Your settings have been restored successfully.</source>
         <translation>設定被還原成功．</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/>
         <source>Select firmware file</source>
         <translation>選擇韌體檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/>
         <source>All files</source>
         <translation>全部檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/>
         <source>Log files</source>
         <translation>日誌檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/>
+        <source>Connecting to device...</source>
+        <translation>正在與裝置連接...</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/>
+        <source>Connected to device</source>
+        <translation>已連接裝置</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/>
+        <source>Disconnected from device</source>
+        <translation>與裝置連接中斷</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/>
         <source>Choose file for dive computer download logfile</source>
         <translation>選取潛水電腦下載日誌檔案</translation>
     </message>
@@ -1744,93 +1773,93 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Type</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Size</source>
         <translation>容量</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>工作壓力</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../qt-models/cylindermodel.cpp" line="25"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="24"/>
         <source>Start press.</source>
         <translation>開始壓力</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>End press.</source>
         <translation>結束壓力</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>O₂%</source>
         <translation>O₂%</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
         <source>Deco switch at</source>
         <translation>減壓交換於</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
         <source>Bot. MOD</source>
         <translation>Bot. MOD</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
         <source>MND</source>
         <translation>MND</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
         <source>Use</source>
         <translation>使用</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="53"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="52"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="57"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="56"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="253"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="247"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>於此處按下將移除此氣瓶.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="265"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="259"/>
         <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
         <translation>減壓氣體交換深度. 除非手動計算, 請優先使用減壓 pO₂ 計算. </translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="268"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="262"/>
         <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max. depth.</source>
         <translation>計算優先使用置底 pO₂. 設定 MOD 自動調整 O₂% , 根據最大深度取得 &apos;*&apos; 最佳 O₂%. </translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="271"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="265"/>
         <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max. depth.</source>
         <translation>計算最佳 Mix END優先. 設定 MHD 自動調整 He%, 根據最大深度取得 &apos;*&apos; 最佳 He%.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="251"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="245"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>此氣瓶仍在使用中，在潛水中，只有未使用的氣瓶可被移除。</translation>
     </message>
@@ -1906,12 +1935,12 @@
         <translation>編輯潛水電腦別名</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>是否移除所選擇的潛水電腦？</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="50"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>您確認要
@@ -1944,22 +1973,22 @@
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/>
         <source>Dive details</source>
         <translation>潛水細節</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/>
         <source>Delete dive</source>
         <translation>刪除此潛水</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/>
         <source>Cancel edit</source>
         <translation>取消編輯</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="165"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/>
         <source>Show on map</source>
         <translation>顯示於地圖</translation>
     </message>
@@ -1967,104 +1996,104 @@
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="111"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/>
         <source>Dive %1</source>
         <translation>Dive %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="115"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/>
         <source>Date:</source>
         <translation>日期:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/>
         <source>Location:</source>
         <translation>位置:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="142"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
         <source>Coordinates:</source>
         <translation>座標:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/>
         <source>Use current
 GPS location:</source>
         <translation>使用目前
 GPS位置:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="170"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/>
         <source>Depth:</source>
         <translation>深度:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="183"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/>
         <source>Duration:</source>
         <translation>時間:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
         <source>Air Temp:</source>
         <translation>氣溫:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="210"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/>
         <source>Water Temp:</source>
         <translation>水溫:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="223"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/>
         <source>Suit:</source>
         <translation>防寒衣：</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="235"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/>
         <source>Buddy:</source>
         <translation>潛伴:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="247"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/>
         <source>Divemaster:</source>
         <translation>潛導：</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/>
         <source>Weight:</source>
         <translation>重量:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="273"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/>
         <source>Cylinder:</source>
         <translation>氣瓶:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="286"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/>
         <source>Gas mix:</source>
         <translation>氣體混合:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="300"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/>
         <source>Start Pressure:</source>
         <translation>起始壓力:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="313"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/>
         <source>End Pressure:</source>
         <translation>結束壓力:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/>
         <source>Rating:</source>
         <translation>評分:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="339"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/>
         <source>Visibility:</source>
         <translation>能見度:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="353"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/>
         <source>Notes:</source>
         <translation>記錄:</translation>
     </message>
@@ -2072,27 +2101,27 @@ GPS位置:</translation>
 <context>
     <name>DiveDetailsView</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="235"/>
         <source>No profile to show</source>
         <translation>無資料顯示</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="241"/>
         <source>Suit:</source>
         <translation>防寒衣：</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="247"/>
         <source>Air Temp:</source>
         <translation>氣溫:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/>
         <source>Cylinder:</source>
         <translation>氣瓶:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="253"/>
         <source>Water Temp:</source>
         <translation>水溫:</translation>
     </message>
@@ -2112,27 +2141,27 @@ GPS位置:</translation>
         <translation>能見度:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/>
         <source>Divemaster:</source>
         <translation>潛導：</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/>
         <source>Weight:</source>
         <translation>重量:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="351"/>
         <source>Buddy:</source>
         <translation>潛伴:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="305"/>
         <source>SAC:</source>
         <translation>耗氣率: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="387"/>
         <source>Notes</source>
         <translation>記錄</translation>
     </message>
@@ -2140,38 +2169,38 @@ GPS位置:</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="178"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="184"/>
         <source> (cyl. %1)</source>
         <translation> (cyl. %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="182"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="188"/>
         <source>ICD</source>
-        <translation type="unfinished"/>
+        <translation>ICD</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="183"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="189"/>
         <source>ΔHe</source>
-        <translation type="unfinished"/>
+        <translation>ΔHe</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="184"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="190"/>
         <source>ΔN₂</source>
-        <translation type="unfinished"/>
+        <translation>ΔN₂</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="202"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="211"/>
         <source>Manual switch to OC</source>
         <translation>手動切換至 OC</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="204"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="213"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>開始</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="205"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="214"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>結束</translation>
@@ -2180,27 +2209,27 @@ GPS位置:</translation>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="41"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="39"/>
         <source>Date/time</source>
         <translation>日期/時間</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="43"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="41"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="45"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="43"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="80"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="78"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="80"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="78"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2209,23 +2238,23 @@ GPS位置:</translation>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="355"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="361"/>
         <source>Dive list</source>
         <translation>潛水列表</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="350"/>
         <source>Cloud credentials</source>
         <translation>雲端憑證</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="357"/>
         <source>Please tap the &apos;+&apos; button to add a dive (or download dives from a supported dive computer)</source>
         <translation>請按下 &apos;+&apos; 鍵新增潛水 (或從支持的潛水電腦下載潛水記錄)</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="382"/>
         <source>No dives in dive list</source>
         <translation>列表中無任何潛水記錄</translation>
     </message>
@@ -2233,102 +2262,102 @@ GPS位置:</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Expand all</source>
         <translation>全部展開</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="858"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
         <source>Collapse all</source>
         <translation>全部摺疊</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="862"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="861"/>
         <source>Collapse others</source>
         <translation>摺疊其它</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="866"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="865"/>
         <source>Remove dive(s) from trip</source>
         <translation>從旅程中移除潛水記錄(多支)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="867"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="866"/>
         <source>Create new trip above</source>
         <translation>設定為新的旅程</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>於上方增加潛水記錄(多支)至旅程中</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="883"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>於下方增加潛水記錄(多支)至旅程中</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="886"/>
         <source>Merge trip with trip above</source>
         <translation>與上方旅程合併</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Merge trip with trip below</source>
         <translation>與下方旅程合併</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Delete dive(s)</source>
         <translation>刪除潛水記錄(多支)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Mark dive(s) invalid</source>
         <translation>標示為無效的潛水記錄(多支)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="898"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Merge selected dives</source>
         <translation>合併所選擇的潛水記錄</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="900"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="899"/>
         <source>Renumber dive(s)</source>
         <translation>為潛水記錄(多支)重新編號</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="901"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="900"/>
         <source>Shift dive times</source>
         <translation>移動潛水時間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="902"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="901"/>
         <source>Split selected dives</source>
         <translation>分開所選擇的潛水</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="903"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="902"/>
         <source>Load image(s) from file(s)</source>
         <translation>從多檔案載入圖片</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="904"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="903"/>
         <source>Load image from web</source>
         <translation>從網頁載入影像</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="930"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="929"/>
         <source>Image files (%1)</source>
         <translation>影像檔案 (%1)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="986"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="985"/>
         <source>%1 does not appear to be an image</source>
         <translation>%1 非影像檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="928"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="927"/>
         <source>Open image files</source>
         <translation>開啟影像檔</translation>
     </message>
@@ -2336,12 +2365,12 @@ GPS位置:</translation>
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../desktop-widgets/locationinformation.cpp" line="392"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="389"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>建立新的潛點, 從潛水紀錄複製相關資訊. </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/locationinformation.cpp" line="393"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="390"/>
         <source>Create a new dive site with this name</source>
         <translation>以此名稱建立新的潛點</translation>
     </message>
@@ -2586,76 +2615,76 @@ GPS位置:</translation>
         <translation>依照 TeX 巨集寫入潛水記錄至檔案. </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
         <source>Export UDDF file as</source>
         <translation>匯出 UDDF 檔案為</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/>
         <source>UDDF files</source>
         <translation>UDDF檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/>
         <source>CSV files</source>
         <translation>CSV檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/>
         <source>HTML files</source>
         <translation>HTML檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/>
         <source>Subsurface files</source>
         <translation>Subsurface檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/>
         <source>TeX files</source>
         <translation>TeX檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
         <source>Export CSV file as</source>
         <translation>匯出 CSV 檔案為</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
         <source>Export world map</source>
         <translation>匯出地圖</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>Export Subsurface XML</source>
         <translation>匯出 Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/>
         <source>Save image depths</source>
         <translation>儲存影像深度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/>
         <source>Export to TeX file</source>
         <translation>輸出 TeX 檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>Export HTML files as</source>
         <translation>匯出 HTML 檔案為</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/>
         <source>Please wait, exporting...</source>
         <translation>請稍待, 匯出中...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/>
         <source>Can&apos;t open file %s</source>
         <translation>無法開啟檔案 %s</translation>
     </message>
@@ -2713,231 +2742,235 @@ GPS位置:</translation>
         <translation>拖拉標籤至每個相關的欄位下方</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="361"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="534"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="352"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="525"/>
         <source>Tab</source>
         <translation>標籤</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="604"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="595"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>部分欄位標籤是預先產生，請拖拉標籤使其能符合實際意義</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="760"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
         <source>Sample time</source>
         <translation>取樣時間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="762"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
         <source>Sample depth</source>
         <translation>取樣深度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="764"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
         <source>Sample temperature</source>
         <translation>取樣溫度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="766"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="639"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
         <source>Sample pO₂</source>
         <translation>取樣 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="768"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
         <source>Sample sensor1 pO₂</source>
         <translation>取樣感測器 1 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="770"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
         <source>Sample sensor2 pO₂</source>
         <translation>取樣感測器 2 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="772"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
         <source>Sample sensor3 pO₂</source>
         <translation>取樣感測器 3 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="774"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
         <source>Sample CNS</source>
         <translation>取樣 CNS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="776"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
         <source>Sample NDL</source>
         <translation>取樣 NDL</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="778"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
         <source>Sample TTS</source>
         <translation>取樣 TTS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="780"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
         <source>Sample stopdepth</source>
         <translation>取樣停留深度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
         <source>Sample pressure</source>
         <translation>取樣壓力</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
         <source>Sample setpoint</source>
         <translation>取樣設定點</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="758"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
         <source>Dive #</source>
         <translation>潛水號#</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="752"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="881"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="756"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="883"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
         <source>Time</source>
         <translation>時間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="885"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="880"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="886"/>
         <source>Max. depth</source>
         <translation>最大深度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
         <source>Avg. depth</source>
         <translation>平均深度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="920"/>
         <source>Air temp.</source>
         <translation>氣溫</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="927"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="922"/>
         <source>Water temp.</source>
         <translation>水溫</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="915"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="910"/>
         <source>Cyl. size</source>
         <translation>氣瓶大小</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="912"/>
         <source>Start pressure</source>
         <translation>開始壓力</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="919"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="914"/>
         <source>End pressure</source>
         <translation>結束壓力</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="921"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="916"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="923"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="918"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="887"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="882"/>
         <source>Location</source>
         <translation>位置</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="889"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="884"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="895"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
         <source>Divemaster</source>
         <translation>潛導</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="897"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
         <source>Buddy</source>
         <translation>潛伴</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="687"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="899"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
         <source>Suit</source>
         <translation>防寒衣</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="688"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="926"/>
         <source>Rating</source>
         <translation>評分</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="689"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="924"/>
         <source>Visibility</source>
         <translation>能見度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="690"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="901"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
         <source>Notes</source>
         <translation>記錄</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="691"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="903"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
         <source>Weight</source>
         <translation>重量</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="692"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="905"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
         <source>Tags</source>
         <translation>標籤</translation>
     </message>
@@ -2945,7 +2978,7 @@ GPS位置:</translation>
 <context>
     <name>DiveObjectHelper</name>
     <message numerus="yes">
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="336"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="339"/>
         <source>(%n dive(s))</source>
         <translation><numerusform>(%n dive(s))</numerusform></translation>
     </message>
@@ -2953,37 +2986,57 @@ GPS位置:</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
+        <location filename="../desktop-widgets/diveplanner.ui" line="74"/>
         <source>Planned dive time</source>
         <translation>計畫潛水時間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../desktop-widgets/diveplanner.ui" line="117"/>
         <source>Altitude</source>
         <translation>海拔</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
+        <location filename="../desktop-widgets/diveplanner.ui" line="124"/>
         <source>ATM pressure</source>
         <translation>大氣壓力</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="166"/>
-        <source>Salinity</source>
-        <translation>鹽度</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="179"/>
         <source>mbar</source>
         <translation>mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="198"/>
+        <location filename="../desktop-widgets/diveplanner.ui" line="144"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="220"/>
+        <location filename="../desktop-widgets/diveplanner.ui" line="131"/>
+        <source>Water type</source>
+        <translation>水種類</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="180"/>
+        <source>Fresh water</source>
+        <translation>淡水</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="185"/>
+        <source>Sea water</source>
+        <translation>海水</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="190"/>
+        <source>EN13319</source>
+        <translation>EN13319</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="195"/>
+        <source>Custom</source>
+        <translation>自訂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="221"/>
         <source>kg/ℓ</source>
         <translation>kg/ℓ</translation>
     </message>
@@ -2996,54 +3049,59 @@ GPS位置:</translation>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="263"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="264"/>
         <source>cyl.</source>
         <translation>氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="359"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="368"/>
         <source>Final depth</source>
         <translation>最後深度</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="361"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="370"/>
         <source>Run time</source>
         <translation>持續時間</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="363"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="372"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="365"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="374"/>
         <source>Used gas</source>
         <translation>使用氣量</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="367"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="376"/>
         <source>CC setpoint</source>
         <translation>CC 設定點</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1008"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="378"/>
+        <source>Dive mode</source>
+        <translation>潛水模式</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1024"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1014"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1030"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1017"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1033"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1064"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1080"/>
         <source>Stop times</source>
-        <translation type="unfinished"/>
+        <translation>停留次數</translation>
     </message>
 </context>
 <context>
@@ -3054,130 +3112,135 @@ GPS位置:</translation>
         <translation>潛水計畫指示</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="117"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="118"/>
         <source>Available gases</source>
         <translation>可用氣瓶</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="118"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="119"/>
         <source>Add cylinder</source>
         <translation>新增氣瓶</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="145"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="150"/>
         <source>Add dive data point</source>
         <translation>新增潛水資料點</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="154"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="160"/>
         <source>Save new</source>
         <translation>另存</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="265"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
 </context>
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/>
         <source>Time</source>
         <translation>時間</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/>
         <source>Pressure</source>
         <translation>壓力</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/>
         <source>Temperature</source>
         <translation>溫度</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/>
         <source>Color</source>
         <translation>顔色</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
         <source>User entered</source>
         <translation>使用者輸入</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
         <source>Pressure S</source>
         <translation>壓力S</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure I</source>
         <translation>壓力I</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
         <source>Ceiling</source>
         <translation>上限深度</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
         <source>SAC</source>
         <translation>耗氣率</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/>
         <source>Setpoint</source>
         <translation>Setpoint</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/>
         <source>Sensor 1</source>
         <translation>Sensor 1</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/>
         <source>Sensor 2</source>
         <translation>Sensor 2</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/>
         <source>Sensor 3</source>
         <translation>Sensor 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/>
         <source>Ambient pressure</source>
         <translation>環境壓力</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Heart rate</source>
         <translation>心率</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
         <source>Gradient factor</source>
         <translation>梯度因子</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Mean depth @ s</source>
         <translation>平均深度 @ s</translation>
     </message>
@@ -3241,142 +3304,148 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="529"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="534"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="532"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="537"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="535"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="485"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="540"/>
         <source>Rating</source>
         <translation>評分</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="488"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="541"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="491"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="546"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="497"/>
         <source>Weight</source>
         <translation>重量</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="550"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="500"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="555"/>
         <source>Suit</source>
         <translation>防寒衣</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="494"/>
         <source>Temp.</source>
         <translation>溫度</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="553"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="503"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="558"/>
         <source>Cylinder</source>
         <translation>氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="556"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="506"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="561"/>
         <source>Gas</source>
         <translation>氣體</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="509"/>
         <source>SAC</source>
         <translation>耗氣率</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="564"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="512"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="569"/>
         <source>OTU</source>
         <translation>氧容許量 OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="513"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="567"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="572"/>
         <source>Max CNS</source>
         <translation>最大 CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="516"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="575"/>
+        <source>Tags</source>
+        <translation>標籤</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Photos</source>
         <translation>照片</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="519"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
         <source>Country</source>
         <translation>國家</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="522"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="573"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="581"/>
         <source>Location</source>
         <translation>位置</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="538"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="543"/>
         <source>Depth(%1)</source>
         <translation>深度(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="538"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="543"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="538"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="543"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="544"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="549"/>
         <source>Temp.(%1%2)</source>
         <translation>溫度 (%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="547"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="552"/>
         <source>Weight(%1)</source>
         <translation>重量(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="547"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="552"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="547"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="552"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="561"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="566"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="561"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="566"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="570"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="578"/>
         <source>Photos before/during/after dive</source>
         <translation>潛水前/中/後的照片</translation>
     </message>
@@ -3384,112 +3453,112 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="41"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/>
         <source>no dives were selected</source>
         <translation>未選取任何潛水</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="51"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation>輸出至 divelogs.de 的表格格式不存在</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="61"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>建立 zip 壓縮檔上傳失敗: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="125"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/>
         <source>internal error</source>
         <translation>內部錯誤</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation>轉換潛水 %1 至 divelogs.de 格式錯誤</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation>寫入 ZIP 檔案: %s 發生錯誤 %d 系統錯誤 %d - %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="822"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/>
         <source>Done</source>
         <translation>完成</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="665"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/>
         <source>Uploading dive list...</source>
         <translation>上傳潛水列表...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="697"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/>
         <source>Downloading dive list...</source>
         <translation>下載潛水列表...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="738"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/>
         <source>Downloading %1 dives...</source>
         <translation>下載 %1 潛水...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="772"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/>
         <source>Download finished - %1</source>
         <translation>下載結束 - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="786"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/>
         <source>Problem with download</source>
         <translation>下載發生錯誤</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/>
         <source>The archive could not be opened:
 </source>
         <translation>存檔無法被開啟: 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="796"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/>
         <source>Corrupted download</source>
         <translation>中斷下載</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="797"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>此存檔無法被開啟:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/>
         <source>Upload finished</source>
         <translation>上傳結束</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="836"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/>
         <source>Upload failed</source>
         <translation>上傳失敗</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="839"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
         <source>Upload successful</source>
         <translation>上傳成功</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
         <source>Login failed</source>
         <translation>登入失敗</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="845"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
         <source>Cannot parse response</source>
         <translation>回覆無法解析</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="857"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/>
         <source>Error: %1</source>
         <translation>錯誤: %1</translation>
     </message>
@@ -3497,68 +3566,68 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/>
         <source>Download</source>
         <translation>下載</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/>
         <source>Choose Bluetooth download mode</source>
         <translation>選擇藍芽下載模式</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/>
         <source>Connecting to dive computer</source>
         <translation>與潛水電腦連結</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="225"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="260"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/>
         <source>Find Uemis dive computer</source>
         <translation>搜索Uemis潛水設備</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="285"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/>
         <source>Cancel download</source>
         <translation>取消下載</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="368"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/>
         <source>Choose file for dive computer download logfile</source>
         <translation>選取潛水電腦下載日誌檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="369"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/>
         <source>Log files</source>
         <translation>日誌檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="394"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/>
         <source>Choose file for dive computer binary dump file</source>
         <translation>選取潛水電腦二進制資料檔</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="395"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/>
         <source>Dump files</source>
         <translation>傾印檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/>
         <source>Retry download</source>
         <translation>重試下載</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/>
         <source>Warning</source>
         <translation>提醒</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>儲存潛水電腦傾印資訊並不會下載潛水記錄</translation>
     </message>
@@ -3630,9 +3699,9 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/>
         <source>Download</source>
         <translation>下載</translation>
     </message>
@@ -3658,7 +3727,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="198"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
@@ -3668,62 +3737,62 @@ p, li { white-space: pre-wrap; }
         <translation>潛水電腦</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="21"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="22"/>
         <source>Bluetooth is not enabled</source>
         <translation>藍芽未被啟用</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/>
         <source> Vendor name: </source>
         <translation>廠商名稱: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="87"/>
         <source> Dive Computer:</source>
         <translation>潛水電腦:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/>
         <source> Connection:</source>
         <translation>連線:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/>
         <source>Retry</source>
         <translation>重試</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="198"/>
         <source>Quit</source>
         <translation>結束</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="212"/>
         <source>Rescan</source>
-        <translation type="unfinished"/>
+        <translation>重新掃描</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/>
         <source> Downloaded dives</source>
         <translation>下載潛水</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="233"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/>
         <source>Info:</source>
         <translation>資訊:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/>
         <source>Accept</source>
         <translation>同意</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="292"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/>
         <source>Select All</source>
         <translation>選擇全部</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="300"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/>
         <source>Unselect All</source>
         <translation>取消選取</translation>
     </message>
@@ -3790,7 +3859,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookPlugin</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebook_integration.cpp" line="36"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebook_integration.cpp" line="35"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
@@ -3798,19 +3867,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FilterBase</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="522"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="520"/>
         <source>Select All</source>
         <translation>選擇全部</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="523"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="521"/>
         <source>Unselect All</source>
         <translation>取消選取</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="522"/>
         <source>Invert Selection</source>
-        <translation type="unfinished"/>
+        <translation>將選擇反轉</translation>
     </message>
 </context>
 <context>
@@ -3833,12 +3902,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/listfilter.ui" line="57"/>
         <source>Negate filter</source>
-        <translation type="unfinished"/>
+        <translation>否定過濾器</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/listfilter.ui" line="60"/>
         <source>¬</source>
-        <translation type="unfinished"/>
+        <translation>¬</translation>
     </message>
 </context>
 <context>
@@ -3862,12 +3931,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2237"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>此功能目前並不支援所選取的潛水電腦</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2242"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2238"/>
         <source>Firmware update failed!</source>
         <translation>韌體上傳失敗！</translation>
     </message>
@@ -3875,7 +3944,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ForwardButton</name>
     <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/ForwardButton.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/ForwardButton.qml" line="48"/>
         <source>Navigate Forward</source>
         <translation>導航前進</translation>
     </message>
@@ -3883,7 +3952,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GasSelectionModel</name>
     <message>
-        <location filename="../qt-models/models.cpp" line="52"/>
+        <location filename="../qt-models/models.cpp" line="51"/>
         <source>cyl.</source>
         <translation>氣瓶</translation>
     </message>
@@ -3891,7 +3960,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GlobalDrawer</name>
     <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="396"/>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="336"/>
         <source>Back</source>
         <translation>回到</translation>
     </message>
@@ -3904,22 +3973,22 @@ p, li { white-space: pre-wrap; }
         <translation>GPS 位置</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="27"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="28"/>
         <source>Date: </source>
         <translation>日期: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="39"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
         <source>Name: </source>
         <translation>名稱: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="51"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation>緯度: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="62"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="63"/>
         <source>Longitude: </source>
         <translation>經度: </translation>
     </message>
@@ -3928,8 +3997,8 @@ p, li { white-space: pre-wrap; }
     <name>GpsLocation</name>
     <message>
         <location filename="../core/gpslocation.cpp" line="135"/>
-        <source>Unknown GPS location</source>
-        <translation>未知的GPS位置</translation>
+        <source>Unknown GPS location (no GPS source)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3948,7 +4017,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="553"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/>
         <source>Location: </source>
         <translation>位置：</translation>
     </message>
@@ -3956,32 +4025,32 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterDelegate</name>
     <message>
-        <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/>
         <source> (same GPS fix)</source>
         <translation> (同一 GPS 位置)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/>
         <source> (~%1 away</source>
         <translation> (~%1 離開</translation>
     </message>
     <message numerus="yes">
-        <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/>
         <source>, %n dive(s) here)</source>
         <translation><numerusform>, %n dive(s) 此處)</numerusform></translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/modeldelegates.cpp" line="507"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/>
         <source>(no existing GPS data, add GPS fix from this dive)</source>
         <translation>(無存在的 GPS 資料, 從此次潛水增加 GPS 位置)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/modeldelegates.cpp" line="509"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/>
         <source>(no GPS data)</source>
         <translation>(無 GPS 資料)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/modeldelegates.cpp" line="511"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/>
         <source>Pick site: </source>
         <translation>選擇潛點: </translation>
     </message>
@@ -3989,7 +4058,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="338"/>
+        <location filename="../qt-models/filtermodels.cpp" line="327"/>
         <source>No location set</source>
         <translation>無位置組合</translation>
     </message>
@@ -4049,13 +4118,13 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/locationInformation.ui" line="162"/>
         <source>Update location on map</source>
-        <translation type="unfinished"/>
+        <translation>更新地圖位置</translation>
     </message>
 </context>
 <context>
     <name>LocationInformationModel</name>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="70"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="68"/>
         <source>Create dive site with this name</source>
         <translation>以此名稱建立潛點</translation>
     </message>
@@ -4104,7 +4173,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Log</name>
     <message>
-        <location filename="../mobile-widgets/qml/Log.qml" line="16"/>
+        <location filename="../mobile-widgets/qml/Log.qml" line="15"/>
         <source>Application Log</source>
         <translation>應用程式日誌</translation>
     </message>
@@ -4114,8 +4183,8 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="529"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="568"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/>
         <source>Notes</source>
         <translation>記錄</translation>
     </message>
@@ -4136,19 +4205,19 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/>
         <source>Air temp.</source>
         <translation>氣溫</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/>
         <source>Water temp.</source>
         <translation>水溫</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="567"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/>
         <source>Location</source>
         <translation>位置</translation>
     </message>
@@ -4213,123 +4282,103 @@ p, li { white-space: pre-wrap; }
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="61"/>
         <source>Extra Info</source>
         <translation>額外資訊</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="55"/>
         <source>Information</source>
         <translation>資訊</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="57"/>
         <source>Statistics</source>
         <translation>統計</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="59"/>
         <source>Photos</source>
         <translation>照片</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="83"/>
         <source>Apply changes</source>
         <translation>套用變更</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="87"/>
         <source>Discard changes</source>
         <translation>取消變更</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="103"/>
         <source>Cylinders</source>
         <translation>氣瓶</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="104"/>
         <source>Add cylinder</source>
         <translation>新增氣瓶</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="107"/>
         <source>Weights</source>
         <translation>配重</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="108"/>
         <source>Add weight system</source>
         <translation>新增配重系統</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/>
-        <source>OC</source>
-        <translation>OC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/>
-        <source>CCR</source>
-        <translation>CCR</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/>
-        <source>pSCR</source>
-        <translation>pSCR</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/>
-        <source>Freedive</source>
-        <translation>自由潛水</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/>
         <source>Air temp. [%1]</source>
         <translation>氣溫 [%1]</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/>
         <source>Water temp. [%1]</source>
         <translation>水溫 [%1]</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/>
         <source>This trip is being edited.</source>
         <translation>此旅程已被編輯.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/>
         <source>Multiple dives are being edited.</source>
         <translation>此些旅程已被編輯.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/>
         <source>This dive is being edited.</source>
         <translation>此潛水已被編輯.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/>
         <source>Trip notes</source>
         <translation>旅程筆記</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="512"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/>
         <source>Trip location</source>
         <translation>旅程位置</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="734"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/>
         <source>New dive site</source>
         <translation>新的潛點</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1038"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/>
         <source>Discard the changes?</source>
         <translation>取消變更？</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1039"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/>
         <source>You are about to discard your changes.</source>
         <translation>您將要放棄您的變更。</translation>
     </message>
@@ -4388,7 +4437,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="166"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="553"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="573"/>
         <source>Open</source>
         <translation>開啟</translation>
     </message>
@@ -4665,7 +4714,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="640"/>
         <source>Toggle gas bar</source>
-        <translation type="unfinished"/>
+        <translation>切換氣體壓力</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="648"/>
@@ -4684,13 +4733,13 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="240"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="245"/>
         <source>&amp;Undo</source>
         <translation>復原</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="681"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="241"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="246"/>
         <source>&amp;Redo</source>
         <translation>取消還原</translation>
     </message>
@@ -4727,82 +4776,75 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="722"/>
         <source>Cloud storage online</source>
-        <translation type="unfinished"/>
+        <translation>線上雲端儲存</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="364"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="400"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="372"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="408"/>
         <source>Connect to</source>
         <translation>連結至</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="394"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="402"/>
         <source>Disconnect from</source>
         <translation>從中斷</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="589"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1630"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="564"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="609"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>在開啟新檔前，請儲存或取消此次潛水的編輯。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="550"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="570"/>
         <source>Open file</source>
         <translation>開啟檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="554"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="691"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="574"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="719"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <source>Don&apos;t save an empty log to the cloud</source>
-        <translation>無法上傳空白日誌至雲端</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="687"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="715"/>
         <source>Traverse image directories</source>
         <translation>經過照片路徑</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="690"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="718"/>
         <source>Scan</source>
         <translation>掃描</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="698"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="726"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>掃描影像...(需要稍待一段時間)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="584"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="645"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="724"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="890"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1008"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1097"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1103"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="583"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="673"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="752"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="907"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/>
         <source>Warning</source>
         <translation>提醒</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="585"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="584"/>
         <source>Trying to merge dives with %1min interval in between</source>
         <translation>以 %1 min 時間區間嘗試合併潛水記錄</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="261"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="266"/>
         <source>Template backup created</source>
         <translation>儲存備份範本</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="262"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="267"/>
         <source>The following backup printing templates were created:
 
 %1
@@ -4824,227 +4866,230 @@ can overwrite them on startup.</source>
 且是自程式啟動覆蓋設定後, 無法直接編輯.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="645"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="673"/>
         <source>Please save or cancel the current dive edit before going online</source>
-        <translation type="unfinished"/>
+        <translation>前往線上版之前請先儲存或取消目前的日誌修改</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="658"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="686"/>
         <source>You have unsaved changes. Do you want to commit them to the cloud storage?
 If answering no, the cloud will only be synced on next call to &quot;Open cloud storage&quot; or &quot;Save to cloud storage&quot;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="668"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="696"/>
         <source>Failure taking cloud storage online</source>
-        <translation type="unfinished"/>
+        <translation>取得線上雲端儲存失敗</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="765"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="793"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>在關閉檔案前，請儲存或取消此次潛水的編輯。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="890"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="907"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>在新增潛水前，請先儲存或取消此次潛水的編輯。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="950"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="967"/>
         <source>Print runtime table</source>
         <translation>列印操作表格</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1008"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>嘗試針對非原計畫的潛水進行重新規畫. </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1097"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>請在嘗試其他編輯時先完成當前編輯</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1103"/>
-        <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
-        <translation>嘗試編輯非手動建立的潛水記錄. </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1150"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1149"/>
         <source>Yearly statistics</source>
         <translation>年統計</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/>
         <source>Dive log files</source>
         <translation>潛水日誌檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1346"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1659"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/>
         <source>Subsurface files</source>
         <translation>Subsurface檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/>
         <source>Cochran</source>
         <translation>Cochran</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1348"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/>
         <source>DiveLogs.de</source>
         <translation>DiveLogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1349"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/>
         <source>JDiveLog</source>
         <translation>JDiveLog</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/>
         <source>Liquivision</source>
         <translation>Liquivision</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1395"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/>
         <source>Suunto</source>
         <translation>Suunto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1396"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/>
         <source>UDCF</source>
         <translation>UDCF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1397"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/>
         <source>UDDF</source>
         <translation>UDDF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/>
         <source>XML</source>
         <translation>XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/>
         <source>Divesoft</source>
         <translation>Divesoft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/>
         <source>Datatrak/WLog</source>
         <translation>Datatrak/WLog</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/>
         <source>MkVI files</source>
         <translation>MkVI檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/>
         <source>APD log viewer</source>
         <translation>APD日誌瀏覽器</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/>
         <source>OSTCtools</source>
         <translation>OSTC工具</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/>
         <source>DAN DL7</source>
         <translation>DAN DL7</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/>
         <source>CSV</source>
         <translation>CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/>
         <source>All files</source>
         <translation>全部檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>您是否要對檔案 %1 所做的修改儲存? </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1471"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>您是否要對資料檔案所做的修改進行儲存? </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="657"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="685"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/>
         <source>Save changes?</source>
         <translation>儲存變更? </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>如果不進行儲存，所做變更將會遺失。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1658"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1679"/>
         <source>Save file as</source>
         <translation>另存新檔</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1744"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/>
         <source>[local cache for] %1</source>
         <translation>[本地端暫存] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1746"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/>
         <source>[cloud storage for] %1</source>
         <translation>[雲端裝置] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1838"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/>
         <source>Opening datafile from older version</source>
         <translation>從較舊的版本中開啟資料檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1839"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/>
         <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>自舊版的 Subsurface 開啟資料檔案. 建議請先在新版程式中, 閱讀相關變更, 特別是有關潛點管理的部分. 
 Subsurface 已嘗試預先填寫部分資料, 值得花些時間看看新的潛點管理系統, 並確認資料是否正確. </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1850"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1873"/>
         <source>Open dive log file</source>
         <translation>打開潛水日誌檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/>
         <source>Contacting cloud service...</source>
         <translation>聯絡雲端服務...</translation>
     </message>
 </context>
 <context>
+    <name>MapPage</name>
+    <message>
+        <location filename="../mobile-widgets/qml/MapPage.qml" line="10"/>
+        <source>Map</source>
+        <translation>地圖</translation>
+    </message>
+</context>
+<context>
     <name>MapWidget</name>
     <message>
-        <location filename="../map-widget/qml/MapWidget.qml" line="252"/>
+        <location filename="../map-widget/qml/MapWidget.qml" line="255"/>
+        <location filename="../map-widget/qml/MapWidget.qml" line="255"/>
         <source>Drag the selected dive location</source>
         <translation>拖移選取的潛點位置</translation>
     </message>
@@ -5053,21 +5098,25 @@ Subsurface 已嘗試預先填寫部分資料, 值得花些時間看看新的潛�
     <name>MapWidgetContextMenu</name>
     <message>
         <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/>
-        <source>Open location in Google Maps</source>
-        <translation>在Google Maps開啟位置</translation>
+        <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/>
+        <source>Open in Google Maps</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/>
-        <source>Copy location to clipboard (decimal)</source>
-        <translation>複製位置到剪貼簿 (十進制)</translation>
+        <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/>
+        <source>Copy coordinates to clipboard (decimal)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/>
-        <source>Copy location to clipboard (sexagesimal)</source>
-        <translation>複製位置到剪貼簿 (六十進制)</translation>
+        <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/>
+        <source>Copy coordinates to clipboard (sexagesimal)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/>
+        <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/>
         <source>Select visible dive locations</source>
         <translation>選取可見的潛點位置</translation>
     </message>
@@ -5085,7 +5134,7 @@ QML 組件 QtPositioning 和 QtLocation 可能遺失!</translation>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="597"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>過濾器顯示 %1 (of %2) 潛水</translation>
     </message>
@@ -5093,12 +5142,12 @@ QML 組件 QtPositioning 和 QtLocation 可能遺失!</translation>
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>請更新您的潛水電腦韌體：目前的版本 %1，最新的版本是 %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/>
         <source>
 
 If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source>
@@ -5107,27 +5156,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
 如果裝置是使用藍芽連接, 在繼續此更新前, 請使用與日誌下載相同的步驟</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="307"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/>
         <source>Not now</source>
         <translation>非現在</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="308"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/>
         <source>Update firmware</source>
         <translation>更新韌體</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="310"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/>
         <source>Firmware upgrade notice</source>
         <translation>韌體升級注意</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="328"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/>
         <source>Save the downloaded firmware as</source>
         <translation>另存下載的韌體至</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/>
         <source>Firmware files</source>
         <translation>韌體檔案</translation>
     </message>
@@ -5136,16 +5185,22 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <name>Page1Form.ui</name>
     <message>
         <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="26"/>
+        <location filename="../mobile-widgets/qml/kirigami/examples/qmakewithstaticplugin/src/Page1Form.ui.qml" line="26"/>
+        <location filename="../mobile-widgets/qml/kirigami/examples/staticcmake/src/Page1Form.ui.qml" line="26"/>
         <source>Page 1</source>
         <translation>頁面 1</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="37"/>
+        <location filename="../mobile-widgets/qml/kirigami/examples/qmakewithstaticplugin/src/Page1Form.ui.qml" line="37"/>
+        <location filename="../mobile-widgets/qml/kirigami/examples/staticcmake/src/Page1Form.ui.qml" line="44"/>
         <source>Text Field</source>
         <translation>字串欄位</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="42"/>
+        <location filename="../mobile-widgets/qml/kirigami/examples/qmakewithstaticplugin/src/Page1Form.ui.qml" line="42"/>
+        <location filename="../mobile-widgets/qml/kirigami/examples/staticcmake/src/Page1Form.ui.qml" line="49"/>
         <source>Press Me</source>
         <translation>請點選</translation>
     </message>
@@ -5153,89 +5208,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="404"/>
-        <source>Open circuit</source>
-        <translation>開放式</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="404"/>
-        <source>CCR</source>
-        <translation>CCR</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="404"/>
-        <source>pSCR</source>
-        <translation>pSCR</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="495"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="542"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="496"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="543"/>
         <source>Last stop at 20ft</source>
         <translation>上一次在20英呎停留</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="497"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="544"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% avg. depth to 20ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="498"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="545"/>
         <source>20ft to surface</source>
         <translation>水面下 20 英尺</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="499"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="546"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="501"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="548"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="502"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="549"/>
         <source>Last stop at 6m</source>
         <translation>Last stop at 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="503"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="550"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% avg. depth to 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="504"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="551"/>
         <source>6m to surface</source>
         <translation>水面下 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="505"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="552"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="508"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="509"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="555"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="556"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="517"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="518"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="564"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="565"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="527"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="574"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="532"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="579"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5338,17 +5378,17 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
         <translation>使用預設值重置所有設定</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/>
         <source>Open default log file</source>
         <translation>開啟預設的日誌檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/>
         <source>Subsurface files</source>
         <translation>Subsurface檔案</translation>
     </message>
@@ -5390,62 +5430,52 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
         <translation>氣體殘壓顯示設定</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="129"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="131"/>
         <source>CCR options:</source>
         <translation>CCR 選項: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Show setpoints when viewing pO₂</source>
-        <translation>查看 pO₂ 時, 顯示設定點</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="82"/>
-        <source>Show individual O₂ sensor values when viewing pO₂</source>
-        <translation>查看 pO₂ 時, 顯示獨立 O₂ 感測器數值</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="178"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="239"/>
         <source>Ceiling display setup</source>
         <translation>Ceiling 顯示設定</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="283"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="314"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>畫出潛水設備回報的警戒上限深度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="217"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="268"/>
         <source>Algorithm for calculated ceiling:</source>
         <translation>演算法計算 ceiling 限制:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="257"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="298"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="184"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="245"/>
         <source>GFHigh</source>
         <translation>GFhigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="327"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="341"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="320"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="175"/>
         <source>pSCR options:</source>
         <translation>pSCR 選項:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="224"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="202"/>
         <source>Dilution ratio</source>
         <translation>稀釋比率</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="197"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="215"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
@@ -5455,78 +5485,103 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
         <translation>pO₂ 門檻值 (最小, 最大)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="72"/>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="103"/>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="139"/>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="152"/>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="39"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="52"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="75"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="98"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="121"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="145"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="122"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="65"/>
         <source>Threshold for pN₂ (maximum only)</source>
         <translation>pN₂ 門檻值 (最大)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="39"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="88"/>
         <source>Threshold for pHe (maximum only)</source>
         <translation>pHe 門檻值 (最大)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="62"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="111"/>
         <source>pO₂ in calculating MOD (maximum only )</source>
         <translation>pO₂ 計算 MOD (最大值)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="96"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="138"/>
         <source>Dive planner default setpoint</source>
         <translation>潛水計畫預設設置點</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="247"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="161"/>
+        <source>Show O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="168"/>
+        <source>Show CCR setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="182"/>
+        <source>pSCR metabolic rate O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="222"/>
+        <source>Show equivalent OC pO₂ with pSCR pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="229"/>
+        <source>Show warnings for isobaric counterdiffusion</source>
+        <translation>顯示isobaric counterdiffusion相關警告</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="288"/>
         <source>Conservatism level</source>
         <translation>保守等級</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="204"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/>
+        <source>Recalculate thumbnails if older than image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/>
         <source>B&amp;ühlmann</source>
         <translation>B&amp;ühlmann</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="290"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="192"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="234"/>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="307"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="275"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="328"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
-        <source>Metabolic rate O₂</source>
-        <translation>代謝速率 O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="321"/>
         <source>&amp;VPM-B</source>
         <translation>&amp;VPM-B</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="340"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="354"/>
         <source>Misc</source>
         <translation>其它</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="346"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="360"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>在裝備分頁中顯示未使用的氣瓶</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="353"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="367"/>
         <source>Show mean depth in Profile</source>
         <translation>於資料中顯示平均深度</translation>
     </message>
@@ -5682,7 +5737,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="145"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurface 雲端裝置</translation>
     </message>
@@ -5722,58 +5777,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
         <translation>是否儲存使用者 ID 於本機？</translation>
     </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>網路</translation>
     </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>無 proxy</translation>
     </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>系統 proxy</translation>
     </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>HTTP proxy</translation>
     </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>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/>
         <source>Change ignored. 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="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
         <source>Change ignored. Cloud storage email and new 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="99"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="113"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>雲端裝置 email 與密碼只接受使用字母, 數字, 與 &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, 和 &apos;+&apos;. </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Subsurface 雲端裝置 (證件認證)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="141"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/>
         <source>Subsurface cloud storage (incorrect password)</source>
         <translation>Subsurface 雲端空間 (密碼錯誤)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="143"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/>
         <source>Subsurface cloud storage (PIN required)</source>
         <translation>Subsurface 雲端空間 (需要密碼)</translation>
     </message>
@@ -6101,123 +6156,128 @@ Please export this template to a different file.</source>
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="756"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="789"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 of %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="785"/>
         <source>Unknown dive computer</source>
         <translation>未知的潛水電腦</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="777"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="813"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>當超過處理時間，顯示關閉 NDL / TTS</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1379"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1415"/>
         <source>Add gas change</source>
         <translation>增加氣瓶交換</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1401"/>
         <source>Make first dive computer</source>
         <translation>設定優先潛水電腦</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="748"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="781"/>
         <source>Planned dive</source>
         <translation>計畫潛水</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="750"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="783"/>
         <source>Manually added dive</source>
         <translation>手動新增潛水</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1403"/>
         <source>Delete this dive computer</source>
         <translation>刪除此潛水電腦</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1382"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1418"/>
         <source> (cyl. %1)</source>
         <translation> (cyl. %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1388"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1424"/>
         <source>Add setpoint change</source>
         <translation>增加設置點變更</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1390"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1426"/>
         <source>Add bookmark</source>
         <translation>新增書籤</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1394"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1436"/>
+        <source>Change divemode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1460"/>
         <source>Edit the profile</source>
         <translation>編輯摘要</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1398"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1464"/>
         <source>Remove event</source>
         <translation>移除事件</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1403"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1469"/>
         <source>Hide similar events</source>
         <translation>隱藏相似事件</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1410"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1476"/>
         <source>Edit name</source>
         <translation>潛水名稱</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1441"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1448"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1507"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
         <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source>
         <translation>調整氣瓶壓力 %1 (目前添加為 %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1463"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1529"/>
         <source>Unhide all events</source>
         <translation>取消隱藏所有事件</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1498"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1564"/>
         <source>Hide events</source>
         <translation>隱藏事件</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1498"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1564"/>
         <source>Hide all %1 events?</source>
         <translation>隱藏所有 %1 事件?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1533"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1599"/>
         <source>Remove the selected event?</source>
         <translation>移除所選擇的事件？</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1534"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1600"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1657"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1737"/>
         <source>Edit name of bookmark</source>
         <translation>編輯書籤名稱</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1658"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1738"/>
         <source>Custom name:</source>
         <translation>自訂名稱:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1663"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1743"/>
         <source>Name is too long!</source>
         <translation>名稱太長！</translation>
     </message>
@@ -6225,152 +6285,159 @@ Please export this template to a different file.</source>
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="168"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="325"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="177"/>
         <source>Starting...</source>
         <translation>開始...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/>
         <source>Open local dive data file</source>
         <translation>開啟本機端潛水資料檔</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="225"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="239"/>
         <source>Opening local data file failed</source>
         <translation>開啟本機端檔案失敗</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="257"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/>
         <source>%1 dives loaded from local dive data file</source>
         <translation>%1 潛水記錄載入自本機端潛水資料檔案</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="354"/>
         <source>working in no-cloud mode</source>
         <translation>於非雲端模式工作</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="353"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="358"/>
         <source>Error parsing local storage, giving up</source>
         <translation>本機端解析錯誤, 中斷</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="362"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="367"/>
         <source>no cloud credentials</source>
         <translation>無雲端憑證</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="435"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="368"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/>
         <source>Please enter valid cloud credentials.</source>
         <translation>請輸入合法的雲端憑證</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="402"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="409"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>雲端裝置 email 與密碼只接受使用字母, 數字, 與 &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, 和 &apos;+&apos;. </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="408"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="415"/>
         <source>Invalid format for email address</source>
         <translation>錯誤的email格式</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="448"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation>嘗試使用新的憑證開啟雲端儲存</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/>
         <source>Testing cloud credentials</source>
         <translation>測試雲端憑證</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="483"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="497"/>
         <source>No response from cloud server to validate the credentials</source>
         <translation>雲端伺服器認證憑證無回應</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="505"/>
         <source>Incorrect cloud credentials</source>
         <translation>不正確的雲端憑證</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="497"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/>
         <source>Cannot connect to cloud storage - cloud account not verified</source>
         <translation>無法連結雲端儲存 - 未認證的帳號</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="538"/>
         <source>Cloud credentials are invalid</source>
         <translation>不合法的雲端憑證</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="537"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="552"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation>無法開啟雲端儲存: 建立 https 連線錯誤</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="566"/>
         <source>Cannot open cloud storage: %1</source>
         <translation>無法開啟雲端儲存: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="562"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="579"/>
         <source>Cannot connect to cloud storage</source>
         <translation>無法連結雲端儲存</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="586"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="603"/>
         <source>Cloud credentials valid, loading dives...</source>
         <translation>雲端認證成功, 載入日誌</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="596"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="613"/>
         <source>Cloud storage error: %1</source>
         <translation>雲端儲存錯誤: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="653"/>
         <source>Loading dives from local storage (&apos;no cloud&apos; mode)</source>
         <translation>從本機端載入日誌 (本機模式)</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="681"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="698"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation>連結雲端伺服器失敗, 返回非雲端狀態</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="706"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="723"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation>成功開啟雲端儲存. 列表無潛水記錄. </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="879"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="880"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="900"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="901"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="879"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="880"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="881"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="900"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="901"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="902"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="879"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="900"/>
         <source>sec</source>
         <translation>sec</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1293"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1315"/>
         <source>Unknown GPS location</source>
         <translation>未知的GPS位置</translation>
     </message>
 </context>
 <context>
+    <name>QMLPrefs</name>
+    <message>
+        <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/>
+        <source>Starting...</source>
+        <translation>開始...</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <location filename="../core/gpslocation.h" line="14"/>
@@ -6378,79 +6445,79 @@ Please export this template to a different file.</source>
         <translation>等待擷取 GPS 位置</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="778"/>
-        <location filename="../core/qthelper.cpp" line="1339"/>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1331"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="780"/>
-        <location filename="../core/qthelper.cpp" line="1338"/>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1330"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="806"/>
+        <location filename="../core/qthelper.cpp" line="794"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="808"/>
+        <location filename="../core/qthelper.cpp" line="796"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="833"/>
-        <location filename="../core/qthelper.cpp" line="1314"/>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1306"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="835"/>
-        <location filename="../core/qthelper.cpp" line="1315"/>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1307"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="860"/>
-        <location filename="../core/qthelper.cpp" line="1364"/>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1356"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="862"/>
-        <location filename="../core/qthelper.cpp" line="1363"/>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1355"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="883"/>
-        <location filename="../core/qthelper.cpp" line="1299"/>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1283"/>
         <source>AIR</source>
         <translation>空氣</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="885"/>
+        <location filename="../core/qthelper.cpp" line="873"/>
         <source>EAN</source>
         <translation>EAN</translation>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="1023"/>
+        <location filename="../core/qthelper.cpp" line="1011"/>
         <source>(%n dive(s))</source>
         <translation><numerusform>(%n dive(s))</numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
+        <location filename="../core/qthelper.cpp" line="1283"/>
         <source>OXYGEN</source>
         <translation>OXYGEN</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1386"/>
+        <location filename="../core/qthelper.cpp" line="1378"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1387"/>
+        <location filename="../core/qthelper.cpp" line="1379"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -6462,24 +6529,24 @@ Please export this template to a different file.</source>
     <message>
         <location filename="../core/divelogexportlogic.cpp" line="56"/>
         <location filename="../core/divelogexportlogic.cpp" line="92"/>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="116"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/>
+        <location filename="../desktop-widgets/templatelayout.h" line="111"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
         <location filename="../core/divelogexportlogic.cpp" line="56"/>
         <location filename="../core/divelogexportlogic.cpp" line="92"/>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="115"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/>
+        <location filename="../desktop-widgets/templatelayout.h" line="110"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
         <location filename="../core/divelogexportlogic.cpp" line="56"/>
         <location filename="../core/divelogexportlogic.cpp" line="92"/>
-        <location filename="../core/helpers.h" line="39"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="116"/>
+        <location filename="../core/qthelper.h" line="79"/>
+        <location filename="../desktop-widgets/templatelayout.h" line="111"/>
         <source>sec</source>
         <translation>sec</translation>
     </message>
@@ -6504,22 +6571,22 @@ Please export this template to a different file.</source>
         <translation>最高</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="512"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/>
         <source>Invalid response from server</source>
         <translation>主機回傳不正確的回應.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="520"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>預期的 XML 標籤 &apos;DiveDateReader&apos;, 取代了 &apos;%1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="566"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>無法找到預期的 XML 標籤 &apos;DiveDates&apos;</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="573"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>異常的 XML 回應. 第 %1 行: %2</translation>
     </message>
@@ -6533,15 +6600,27 @@ Please export this template to a different file.</source>
         <source>Tags</source>
         <translation>標籤</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="634"/>
+        <source>Don&apos;t save an empty log to the cloud</source>
+        <translation>無法上傳空白日誌至雲端</translation>
+    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2134"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2159"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2155"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>所選取的潛水電腦，尚未支援此功能</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2132"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2141"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2152"/>
+        <source>Failed!</source>
+        <translation>失敗！</translation>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -6557,22 +6636,22 @@ Please export this template to a different file.</source>
     </message>
     <message>
         <location filename="../desktop-widgets/renumber.ui" line="61"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="150"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="149"/>
         <source>New starting number</source>
         <translation>新的開始編號</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="148"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="147"/>
         <source>New number</source>
         <translation>新編號</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="153"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="152"/>
         <source>Renumber selected dives</source>
         <translation>重新編號所選取的潛水記錄</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="155"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="154"/>
         <source>Renumber all dives</source>
         <translation>重新編號全部的潛水</translation>
     </message>
@@ -6580,7 +6659,7 @@ Please export this template to a different file.</source>
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2262"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2258"/>
         <source>Reset settings failed!</source>
         <translation>重置設定失敗! </translation>
     </message>
@@ -6619,121 +6698,111 @@ Please export this template to a different file.</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="16"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="17"/>
         <source>Undefined</source>
         <translation>未定義</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="17"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="18"/>
         <source>Incorrect username/password combination</source>
         <translation>不正確的帳號/密碼組合</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="18"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="19"/>
         <source>Credentials need to be verified</source>
         <translation>需要檢查憑證</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="19"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="20"/>
         <source>Credentials verified</source>
         <translation>憑證已確認</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="20"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="21"/>
         <source>No cloud mode</source>
         <translation>無雲端模式</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="30"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="31"/>
         <source>Cloud status</source>
         <translation>雲端狀態</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="38"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="39"/>
         <source>Email</source>
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="44"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="45"/>
         <source>Not applicable</source>
         <translation>不適合</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="52"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="54"/>
         <source>Change</source>
         <translation>變更</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="59"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="61"/>
         <source>Status</source>
         <translation>狀態</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="86"/>
         <source>Theme</source>
         <translation>主題</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="92"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="94"/>
         <source>Blue</source>
         <translation>藍色</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="107"/>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="159"/>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="212"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="109"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="161"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="214"/>
         <source>regular text</source>
         <translation>regular text</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="122"/>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="174"/>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="124"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="176"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="229"/>
         <source>Highlight</source>
         <translation>標示</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="145"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="147"/>
         <source>Pink</source>
         <translation>粉紅</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="197"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="199"/>
         <source>Dark</source>
         <translation>陰暗</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="261"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="263"/>
         <source>Subsurface GPS data webservice</source>
         <translation>Subsurface GPS 資料網站服務</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="270"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="272"/>
         <source>Distance threshold (meters)</source>
         <translation>距離門檻值 (meters)</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="286"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="288"/>
         <source>Time threshold (minutes)</source>
         <translation>時間門檻值 (minutes)</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="313"/>
-        <source>Dive computer</source>
-        <translation>潛水電腦</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="322"/>
-        <source>Save detailed log</source>
-        <translation>儲存詳細日誌</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="345"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="315"/>
         <source>Developer</source>
         <translation>開發人員</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="354"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="324"/>
         <source>Display Developer menu</source>
         <translation>顯示開發者選單</translation>
     </message>
@@ -6800,39 +6869,39 @@ Not all images have timestamps in the range between
         <translation>哪個日期和時間將會被顯示在圖片上?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/>
         <source>Open image file</source>
         <translation>開啟影像檔</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="311"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/>
         <source>Image files</source>
         <translation>影像檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/>
         <source>Selected dive date/time</source>
         <translation>潛水日期/時間選擇</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/>
         <source>First selected dive date/time</source>
         <translation>最初選擇的潛水日期/時間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/>
         <source>Last selected dive date/time</source>
         <translation>上次選擇的潛水日期/時間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="393"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/>
         <source>
 Files with inappropriate date/time</source>
         <translation>
 檔案日期/時間不正確</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="403"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/>
         <source>No Exif date/time found</source>
         <translation>無 Exif 日期/時間</translation>
     </message>
@@ -6925,28 +6994,28 @@ Files with inappropriate date/time</source>
         <translation>重要訊息 (錯誤, 警告, 其它)</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/>
         <source>Open SmartTrak files</source>
         <translation>開啟 SmartTrak 檔案</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/>
         <source>SmartTrak files</source>
         <translation>SmartTrak檔案</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/>
         <source>All files</source>
         <translation>全部檔案</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/>
         <source>Subsurface files</source>
         <translation>Subsurface檔案</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/>
         <source>Open Subsurface files</source>
         <translation>打開 Subsurface 檔案</translation>
     </message>
@@ -7104,12 +7173,12 @@ Files with inappropriate date/time</source>
 <context>
     <name>StartPage</name>
     <message>
-        <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.&lt;br/&gt;&lt;br/&gt;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).&lt;br/&gt;&lt;br/&gt;To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source>
-        <translation>搭配Subsurface雲端使用Subsurface-mobile, 請輸入您的雲端憑證.&lt;br/&gt;&lt;br/&gt;若這是您第一次使用Subsurface雲端空間, 請輸入合法 email (全部小寫) 與選擇的密碼 (字母與數字).&lt;br/&gt;&lt;br/&gt;在Subsurface-mobile上使用裝置的本機端資料, 請選擇上方的無雲端按鈕. </translation>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="37"/>
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.&lt;br/&gt;&lt;br/&gt;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).&lt;br/&gt;&lt;br/&gt;To use Subsurface-mobile only with local data on this device, select the no cloud button above.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="50"/>
         <source>Thank you for registering with Subsurface. We sent &lt;b&gt;%1&lt;/b&gt; a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.&lt;br/&gt;&lt;br/&gt;In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).&lt;br/&gt;&lt;br/&gt;</source>
         <translation>感謝您註冊 Subsurface. 我們傳送密碼 &lt;b&gt;%1&lt;/b&gt; 來完成註冊. 如果在15分鐘內未收到 email, 請確認輸入的 email 地址是否正確, 與 email 的垃圾郵件信箱.&lt;br/&gt;&lt;br/&gt;有關雲端帳號設定的任何問題, 請在使用者論壇直接與我們聯絡 (https://subsurface-divelog.org/user-forum/).&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
@@ -7144,53 +7213,53 @@ Files with inappropriate date/time</source>
     <message>
         <location filename="../desktop-widgets/about.cpp" line="20"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2018&lt;/span&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;跨平台潛水日誌軟體&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2018&lt;/span&gt;</translation>
     </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="284"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/>
         <source>Enter User ID and click Download</source>
         <translation>輸入使用者 ID 並點選下載</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="308"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
         <source>Webservice</source>
         <translation>網頁服務</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="392"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/>
         <source>Connecting...</source>
         <translation>連結...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/>
         <source>Download finished</source>
         <translation>下載結束</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="425"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/>
         <source>Download error: %1</source>
         <translation>下載失敗: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="435"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/>
         <source>Connection error: </source>
         <translation>連結錯誤:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="438"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/>
         <source>Invalid user identifier!</source>
         <translation>錯誤的使用者 Id !</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="441"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/>
         <source>Cannot parse response!</source>
         <translation>回覆無法解析!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/>
         <source>Download successful</source>
         <translation>下載成功</translation>
     </message>
@@ -7198,7 +7267,7 @@ Files with inappropriate date/time</source>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="558"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/>
         <source>Suits: </source>
         <translation>潛水衣: </translation>
     </message>
@@ -7206,7 +7275,7 @@ Files with inappropriate date/time</source>
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="172"/>
+        <location filename="../qt-models/filtermodels.cpp" line="170"/>
         <source>No suit set</source>
         <translation>無套裝組合</translation>
     </message>
@@ -7293,33 +7362,33 @@ Files with inappropriate date/time</source>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="306"/>
-        <source>Salinity</source>
-        <translation>鹽度</translation>
+        <source>Water type</source>
+        <translation>水種類</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="72"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="71"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="78"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="85"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="84"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="78"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="85"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="84"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="78"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
         <source>sec</source>
         <translation>sec</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="85"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="84"/>
         <source>d</source>
         <translation>d</translation>
     </message>
@@ -7334,35 +7403,40 @@ Files with inappropriate date/time</source>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.ui" line="29"/>
         <source>Zoom level</source>
-        <translation type="unfinished"/>
+        <translation>縮放等級</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/>
         <source>Load image(s) from file(s)</source>
         <translation>從多檔案載入圖片</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/>
         <source>Load image(s) from web</source>
         <translation>從網路載入圖片</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/>
         <source>Delete selected images</source>
         <translation>刪除選取的影像</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/>
         <source>Delete all images</source>
         <translation>刪除全部影像</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="94"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/>
+        <source>Recalculate selected thumbnails</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/>
         <source>Deleting Images</source>
         <translation>刪除影像</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="94"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/>
         <source>Are you sure you want to delete all images?</source>
         <translation>你確定要刪除所有的影像? </translation>
     </message>
@@ -7472,31 +7546,31 @@ Files with inappropriate date/time</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="87"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="84"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="90"/>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="93"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="96"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="98"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="87"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="84"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="90"/>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="93"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="96"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="98"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="87"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="84"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="90"/>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="93"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="96"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="98"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
         <source>sec</source>
         <translation>sec</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="127"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="124"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -7505,17 +7579,17 @@ mixed from Air and using:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="129"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="126"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="133"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="130"/>
         <source>and</source>
         <translation>與</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="135"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="132"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
@@ -7532,7 +7606,7 @@ mixed from Air and using:
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="542"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="540"/>
         <source>Tags: </source>
         <translation>標籤:</translation>
     </message>
@@ -7540,7 +7614,7 @@ mixed from Air and using:
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="197"/>
+        <location filename="../qt-models/filtermodels.cpp" line="195"/>
         <source>Empty tags</source>
         <translation>空標籤</translation>
     </message>
@@ -7548,17 +7622,17 @@ mixed from Air and using:
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-models/tankinfomodel.cpp" line="95"/>
+        <location filename="../qt-models/tankinfomodel.cpp" line="92"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location filename="../qt-models/tankinfomodel.cpp" line="95"/>
+        <location filename="../qt-models/tankinfomodel.cpp" line="92"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-models/tankinfomodel.cpp" line="95"/>
+        <location filename="../qt-models/tankinfomodel.cpp" line="92"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7731,7 +7805,7 @@ mixed from Air and using:
         <translation>顏色 6</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.cpp" line="141"/>
+        <location filename="../desktop-widgets/templateedit.cpp" line="142"/>
         <source>Do you want to save your changes?</source>
         <translation>是否要儲存設定? </translation>
     </message>
@@ -7739,15 +7813,23 @@ mixed from Air and using:
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="682"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="680"/>
         <source>%1click to visit %2</source>
         <translation>按下 %1 前往 %2</translation>
     </message>
 </context>
 <context>
+    <name>ToolBarApplicationHeader</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ToolBarApplicationHeader.qml" line="125"/>
+        <source>More Actions</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../profile-widget/divetooltipitem.cpp" line="138"/>
+        <location filename="../profile-widget/divetooltipitem.cpp" line="137"/>
         <source>Information</source>
         <translation>資訊</translation>
     </message>
@@ -7755,125 +7837,130 @@ mixed from Air and using:
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="72"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="73"/>
         <source>(%1 shown)</source>
         <translation>(%1 顯示)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="228"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="231"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="238"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="234"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="241"/>
         <source>Rating</source>
         <translation>評分</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="237"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>Depth(%1)</source>
         <translation>深度(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="237"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="237"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="240"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="243"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Temp.(%1%2)</source>
         <translation>溫度 (%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="252"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="259"/>
         <source>Cylinder</source>
         <translation>氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="266"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="273"/>
         <source>Max. CNS</source>
         <translation>最大 CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="365"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="276"/>
+        <source>Tags</source>
+        <translation>標籤</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="375"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="365"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="375"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="246"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
         <source>Weight(%1)</source>
         <translation>重量(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="246"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="246"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="249"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Suit</source>
         <translation>防寒衣</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="255"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="262"/>
         <source>Gas</source>
         <translation>氣體</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="260"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="267"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="260"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="267"/>
         <location filename="../qt-models/divetripmodel.cpp" line="409"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="263"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="270"/>
         <source>OTU</source>
         <translation>氧容許量 OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="269"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="279"/>
         <source>Photos before/during/after dive</source>
         <translation>潛水前/中/後的照片</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="272"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="282"/>
         <source>Country</source>
         <translation>國家</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="275"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="285"/>
         <source>Location</source>
         <translation>位置</translation>
     </message>
@@ -7894,74 +7981,74 @@ mixed from Air and using:
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>檢查有無更新。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="63"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface 無法確認更新。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>錯誤持續發生:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>請確認您的網路連線。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="79"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>您已使用最新版的 Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="82"/>
+        <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>新版 Subsurface 已提供使用，&lt;br/&gt;點選下載：&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt;</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>新版 Subsurface 已提供使用．</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <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>最新版本是 %1，請確認 %2 於下載頁面 %3，取得更新資訊。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>最新釋出版本是</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="100"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>主機回傳下列資訊：</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="116"/>
         <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>Subsurface每兩周會定期是否有新版本更新. 
 如果不希望Subsurface持續檢查, 請點選拒絕. </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="118"/>
         <source>Decline</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Accept</source>
         <translation>同意</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="121"/>
         <source>Automatic check for updates</source>
         <translation>自動更新檢查</translation>
     </message>
@@ -8139,12 +8226,12 @@ Language: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-models/weigthsysteminfomodel.cpp" line="84"/>
+        <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location filename="../qt-models/weigthsysteminfomodel.cpp" line="84"/>
+        <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -8192,12 +8279,12 @@ Language: %1</source>
         <translation>上傳</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="213"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/>
         <source>Operation timed out</source>
         <translation>操作時間結束</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="234"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/>
         <source>Transferring data...</source>
         <translation>傳送資料...</translation>
     </message>
@@ -8232,15 +8319,15 @@ Language: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2183"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2208"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2179"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2204"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>此功能目前並不支援所選取的潛水電腦</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2185"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2196"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2205"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2181"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2192"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2201"/>
         <source>Failed!</source>
         <translation>失敗！</translation>
     </message>
@@ -8248,17 +8335,17 @@ Language: %1</source>
 <context>
     <name>YearStatisticsItem</name>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="64"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="62"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="64"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="62"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="64"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="62"/>
         <source>sec</source>
         <translation>sec</translation>
     </message>
@@ -8266,79 +8353,79 @@ Language: %1</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="127"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="125"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>年 
  &gt; 月 / 旅程</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="130"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="128"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="133"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="131"/>
         <source>Duration 
  Total</source>
         <translation>時間 
 總計</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="136"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="134"/>
         <source>
 Average</source>
         <translation>
 平均</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="139"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="137"/>
         <source>
 Shortest</source>
         <translation>
 最短</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="142"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="140"/>
         <source>
 Longest</source>
         <translation>
 最長</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="145"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="143"/>
         <source>Depth (%1)
  Average</source>
         <translation>深度 (%1)
 平均</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="148"/>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="157"/>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="166"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="146"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="155"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="164"/>
         <source>
 Minimum</source>
         <translation>
 最小</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="151"/>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="160"/>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="169"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="149"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="158"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="167"/>
         <source>
 Maximum</source>
         <translation>
 最大</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="154"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="152"/>
         <source>SAC (%1)
  Average</source>
         <translation>耗氣率 (%1)
 平均</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="163"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="161"/>
         <source>Temp. (%1)
  Average</source>
         <translation>溫度 (%1)
@@ -8348,7 +8435,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="792"/>
+        <location filename="../core/libdivecomputer.c" line="810"/>
         <source>Error parsing the header</source>
         <translation>檔頭解析錯誤</translation>
     </message>
@@ -8356,74 +8443,74 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../core/cochran.c" line="304"/>
-        <location filename="../core/cochran.c" line="310"/>
-        <location filename="../core/cochran.c" line="380"/>
-        <location filename="../core/libdivecomputer.c" line="250"/>
+        <location filename="../core/cochran.c" line="305"/>
+        <location filename="../core/cochran.c" line="311"/>
+        <location filename="../core/cochran.c" line="381"/>
+        <location filename="../core/libdivecomputer.c" line="258"/>
         <source>deco stop</source>
         <translation>減壓停留</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="331"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/import-csv.c" line="682"/>
-        <location filename="../core/libdivecomputer.c" line="252"/>
+        <location filename="../core/cochran.c" line="332"/>
+        <location filename="../core/cochran.c" line="386"/>
+        <location filename="../core/import-csv.c" line="683"/>
+        <location filename="../core/libdivecomputer.c" line="260"/>
         <source>ascent</source>
         <translation>上升</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="337"/>
-        <location filename="../core/import-csv.c" line="660"/>
+        <location filename="../core/cochran.c" line="338"/>
+        <location filename="../core/import-csv.c" line="661"/>
         <source>battery</source>
         <translation>電池</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="343"/>
-        <location filename="../core/libdivecomputer.c" line="268"/>
+        <location filename="../core/cochran.c" line="344"/>
+        <location filename="../core/libdivecomputer.c" line="276"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="267"/>
+        <location filename="../core/cochran.c" line="349"/>
+        <location filename="../core/libdivecomputer.c" line="275"/>
         <source>maxdepth</source>
         <translation>最大深度</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/cochran.c" line="399"/>
-        <location filename="../core/libdivecomputer.c" line="269"/>
+        <location filename="../core/cochran.c" line="354"/>
+        <location filename="../core/cochran.c" line="400"/>
+        <location filename="../core/libdivecomputer.c" line="277"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="360"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/cochran.c" line="416"/>
-        <location filename="../core/import-csv.c" line="763"/>
-        <location filename="../core/libdivecomputer.c" line="260"/>
-        <location filename="../core/libdivecomputer.c" line="274"/>
-        <location filename="../core/plannernotes.c" line="175"/>
+        <location filename="../core/cochran.c" line="361"/>
+        <location filename="../core/cochran.c" line="410"/>
+        <location filename="../core/cochran.c" line="417"/>
+        <location filename="../core/import-csv.c" line="764"/>
+        <location filename="../core/libdivecomputer.c" line="268"/>
+        <location filename="../core/libdivecomputer.c" line="282"/>
+        <location filename="../core/plannernotes.c" line="50"/>
         <source>gaschange</source>
         <translation>氣瓶更換</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="251"/>
+        <location filename="../core/cochran.c" line="366"/>
+        <location filename="../core/cochran.c" line="405"/>
+        <location filename="../core/libdivecomputer.c" line="259"/>
         <source>rbt</source>
         <translation>剩餘滯底時間</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="374"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/libdivecomputer.c" line="253"/>
+        <location filename="../core/cochran.c" line="375"/>
+        <location filename="../core/cochran.c" line="422"/>
+        <location filename="../core/libdivecomputer.c" line="261"/>
         <source>ceiling</source>
         <translation>上限深度</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/libdivecomputer.c" line="255"/>
+        <location filename="../core/cochran.c" line="391"/>
+        <location filename="../core/libdivecomputer.c" line="263"/>
         <source>transmitter</source>
         <translation>發射器</translation>
     </message>
@@ -8494,7 +8581,7 @@ Maximum</source>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="371"/>
-        <location filename="../core/dive.c" line="30"/>
+        <location filename="../core/dive.c" line="32"/>
         <source>deco</source>
         <translation>減壓</translation>
     </message>
@@ -8509,7 +8596,7 @@ Maximum</source>
         <translation>多層上升</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
+        <location filename="../core/dive.c" line="30"/>
         <source>fresh</source>
         <translation>新進</translation>
     </message>
@@ -8535,7 +8622,7 @@ Maximum</source>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="408"/>
-        <location filename="../core/dive.c" line="29"/>
+        <location filename="../core/dive.c" line="31"/>
         <source>instructor</source>
         <translation>教練</translation>
     </message>
@@ -8546,19 +8633,19 @@ Maximum</source>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="412"/>
-        <location filename="../core/dive.c" line="28"/>
+        <location filename="../core/dive.c" line="30"/>
         <source>night</source>
         <translation>夜潛</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="414"/>
-        <location filename="../core/dive.c" line="26"/>
+        <location filename="../core/dive.c" line="28"/>
         <source>cave</source>
         <translation>洞穴</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="416"/>
-        <location filename="../core/dive.c" line="25"/>
+        <location filename="../core/dive.c" line="27"/>
         <source>ice</source>
         <translation>冰潛</translation>
     </message>
@@ -8569,25 +8656,25 @@ Maximum</source>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="427"/>
-        <location filename="../core/dive.c" line="26"/>
+        <location filename="../core/dive.c" line="28"/>
         <source>wreck</source>
         <translation>沈船</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="429"/>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/dive.c" line="29"/>
         <source>river</source>
         <translation>河流</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="431"/>
-        <location filename="../core/dive.c" line="24"/>
+        <location filename="../core/dive.c" line="26"/>
         <source>drift</source>
         <translation>放流</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="433"/>
-        <location filename="../core/dive.c" line="29"/>
+        <location filename="../core/dive.c" line="31"/>
         <source>photo</source>
         <translation>照片</translation>
     </message>
@@ -8629,156 +8716,161 @@ Maximum</source>
         <translation>錯誤: 無潛水</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
+        <location filename="../core/dive.c" line="26"/>
         <source>boat</source>
         <translation>船潛</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
+        <location filename="../core/dive.c" line="26"/>
         <source>shore</source>
         <translation>岸潛</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
+        <location filename="../core/dive.c" line="27"/>
         <source>deep</source>
         <translation>深潛</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
+        <location filename="../core/dive.c" line="27"/>
         <source>cavern</source>
         <translation>地洞</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
+        <location filename="../core/dive.c" line="28"/>
         <source>altitude</source>
         <translation>高海拔</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/dive.c" line="29"/>
         <source>pool</source>
         <translation>泳池</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/dive.c" line="29"/>
         <source>lake</source>
         <translation>湖泊</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
+        <location filename="../core/dive.c" line="30"/>
         <source>student</source>
         <translation>學生</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="29"/>
+        <location filename="../core/dive.c" line="31"/>
         <source>video</source>
         <translation>影片</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="34"/>
+        <location filename="../core/dive.c" line="36"/>
         <source>OC-gas</source>
         <translation>OC 氣源</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="34"/>
+        <location filename="../core/dive.c" line="36"/>
         <source>diluent</source>
         <translation>填充氣體</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="34"/>
+        <location filename="../core/dive.c" line="36"/>
         <location filename="../core/equipment.c" line="91"/>
-        <location filename="../core/planner.c" line="1146"/>
-        <location filename="../core/planner.c" line="1149"/>
+        <location filename="../core/planner.c" line="1166"/>
+        <location filename="../core/planner.c" line="1169"/>
         <source>oxygen</source>
         <translation>氧氣</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="34"/>
+        <location filename="../core/dive.c" line="36"/>
         <source>not used</source>
         <translation>未使用</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="265"/>
+        <location filename="../core/dive.c" line="41"/>
+        <source>Open circuit</source>
+        <translation>開放式</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="295"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="270"/>
-        <location filename="../core/plannernotes.c" line="58"/>
-        <location filename="../core/plannernotes.c" line="59"/>
-        <location filename="../core/plannernotes.c" line="60"/>
-        <location filename="../core/qthelper.cpp" line="662"/>
+        <location filename="../core/dive.c" line="300"/>
+        <location filename="../core/plannernotes.c" line="68"/>
+        <location filename="../core/plannernotes.c" line="69"/>
+        <location filename="../core/plannernotes.c" line="70"/>
+        <location filename="../core/qthelper.cpp" line="656"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="665"/>
+        <location filename="../core/dive.c" line="304"/>
+        <location filename="../core/qthelper.cpp" line="659"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="311"/>
+        <location filename="../core/dive.c" line="341"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="316"/>
+        <location filename="../core/dive.c" line="346"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="357"/>
-        <location filename="../core/qthelper.cpp" line="583"/>
-        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/dive.c" line="387"/>
+        <location filename="../core/qthelper.cpp" line="572"/>
+        <location filename="../core/qthelper.cpp" line="587"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="362"/>
-        <location filename="../core/qthelper.cpp" line="586"/>
-        <location filename="../core/qthelper.cpp" line="600"/>
+        <location filename="../core/dive.c" line="392"/>
+        <location filename="../core/qthelper.cpp" line="575"/>
+        <location filename="../core/qthelper.cpp" line="589"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="385"/>
+        <location filename="../core/dive.c" line="415"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="387"/>
+        <location filename="../core/dive.c" line="417"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="392"/>
+        <location filename="../core/dive.c" line="422"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="394"/>
+        <location filename="../core/dive.c" line="424"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="413"/>
-        <location filename="../core/qthelper.cpp" line="609"/>
-        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/dive.c" line="443"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="608"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="417"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
-        <location filename="../core/qthelper.cpp" line="617"/>
+        <location filename="../core/dive.c" line="447"/>
+        <location filename="../core/qthelper.cpp" line="596"/>
+        <location filename="../core/qthelper.cpp" line="606"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="672"/>
+        <location filename="../core/divelist.c" line="683"/>
         <location filename="../core/equipment.c" line="87"/>
-        <location filename="../core/planner.c" line="1142"/>
-        <location filename="../core/planner.c" line="1145"/>
+        <location filename="../core/planner.c" line="1162"/>
+        <location filename="../core/planner.c" line="1165"/>
         <source>air</source>
         <translation>air</translation>
     </message>
@@ -8813,398 +8905,398 @@ Maximum</source>
         <translation>吊掛式</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="113"/>
+        <location filename="../core/file.c" line="115"/>
         <source>No dives in the input file &apos;%s&apos;</source>
         <translation>輸入檔案 &apos;%s&apos; 並無潛水記錄</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="321"/>
-        <location filename="../core/import-csv.c" line="115"/>
-        <location filename="../core/import-csv.c" line="360"/>
-        <location filename="../core/import-csv.c" line="501"/>
-        <location filename="../core/import-csv.c" line="839"/>
-        <location filename="../core/ostctools.c" line="49"/>
+        <location filename="../core/file.c" line="323"/>
+        <location filename="../core/import-csv.c" line="116"/>
+        <location filename="../core/import-csv.c" line="361"/>
+        <location filename="../core/import-csv.c" line="502"/>
+        <location filename="../core/import-csv.c" line="840"/>
+        <location filename="../core/ostctools.c" line="50"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>無法讀取 &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="208"/>
+        <location filename="../core/file.c" line="210"/>
         <source>Cannot open CSV file %s; please use Import log file dialog</source>
         <comment>'Import log file' should be the same text as corresponding label in Import menu</comment>
         <translation>無法開啟 CSV 檔案 %s；請使用匯入 log 檔案對話盒</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="323"/>
+        <location filename="../core/file.c" line="325"/>
         <source>Empty file &apos;%s&apos;</source>
         <translation>空檔案 &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/import-csv.c" line="599"/>
+        <location filename="../core/import-csv.c" line="600"/>
         <source>Poseidon import failed: unable to read &apos;%s&apos;</source>
         <translation>Poseidon 匯入失敗：無法讀取 &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/import-csv.c" line="635"/>
+        <location filename="../core/import-csv.c" line="636"/>
         <source>Mouth piece position OC</source>
         <translation>OC 咬嘴位置</translation>
     </message>
     <message>
-        <location filename="../core/import-csv.c" line="639"/>
+        <location filename="../core/import-csv.c" line="640"/>
         <source>Mouth piece position CC</source>
         <translation>OC 咬嘴位置</translation>
     </message>
     <message>
-        <location filename="../core/import-csv.c" line="643"/>
+        <location filename="../core/import-csv.c" line="644"/>
         <source>Mouth piece position unknown</source>
         <translation>未知咬嘴位置</translation>
     </message>
     <message>
-        <location filename="../core/import-csv.c" line="647"/>
+        <location filename="../core/import-csv.c" line="648"/>
         <source>Mouth piece position not connected</source>
         <translation>無法連結咬嘴位置</translation>
     </message>
     <message>
-        <location filename="../core/import-csv.c" line="654"/>
+        <location filename="../core/import-csv.c" line="655"/>
         <source>Power off</source>
         <translation>關閉電源</translation>
     </message>
     <message>
-        <location filename="../core/import-csv.c" line="704"/>
+        <location filename="../core/import-csv.c" line="705"/>
         <source>O₂ calibration failed</source>
         <translation>O₂ 校正失敗</translation>
     </message>
     <message>
-        <location filename="../core/import-csv.c" line="706"/>
-        <location filename="../core/import-csv.c" line="715"/>
+        <location filename="../core/import-csv.c" line="707"/>
+        <location filename="../core/import-csv.c" line="716"/>
         <source>O₂ calibration</source>
         <translation>O₂ 校正</translation>
     </message>
     <message>
-        <location filename="../core/import-csv.c" line="234"/>
+        <location filename="../core/import-csv.c" line="235"/>
         <source>No dive profile found from &apos;%s&apos;</source>
         <translation>&apos;%s&apos; 無潛水資料</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="56"/>
+        <location filename="../core/git-access.c" line="73"/>
         <source>Checkout from storage (%lu/%lu)</source>
         <translation>自儲存空間查看 (%lu/%lu)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="87"/>
+        <location filename="../core/git-access.c" line="104"/>
         <source>Transfer from storage (%d/%d)</source>
         <translation>自儲存空間傳輸 (%d/%d)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="99"/>
+        <location filename="../core/git-access.c" line="116"/>
         <source>Transfer to storage (%d/%d)</source>
         <translation>傳輸至儲存空間 (%d/%d)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="135"/>
+        <location filename="../core/git-access.c" line="152"/>
         <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation>本地端暫存目錄 %s 損壞 - 無法與 Subsurface 雲端進行同步</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="158"/>
-        <location filename="../core/git-access.c" line="178"/>
+        <location filename="../core/git-access.c" line="175"/>
+        <location filename="../core/git-access.c" line="195"/>
         <source>Could not update local cache to newer remote data</source>
         <translation>無法更新本地端暫存來更新遠端資料</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="171"/>
+        <location filename="../core/git-access.c" line="188"/>
         <source>Subsurface cloud storage corrupted</source>
         <translation>Subsurface 雲端裝置中斷</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="307"/>
+        <location filename="../core/git-access.c" line="324"/>
         <source>Could not update Subsurface cloud storage, try again later</source>
         <translation>無法更新 Subsurface 雲端裝置, 請稍待後重試</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="367"/>
+        <location filename="../core/git-access.c" line="384"/>
         <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
         <translation>遠端裝置與本地端資料分歧. 錯誤: 合併失敗 (%s)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="397"/>
+        <location filename="../core/git-access.c" line="414"/>
         <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
         <translation>遠端裝置與本機端資料分歧. 無法合併本機端與遠端的差異資料</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="431"/>
+        <location filename="../core/git-access.c" line="448"/>
         <source>Remote storage and local data diverged</source>
         <translation>遠端裝置與本機端資料分歧</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="434"/>
+        <location filename="../core/git-access.c" line="451"/>
         <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
         <translation>遠端裝置與本機端資料分歧. 錯誤: 寫入資料失敗 (%s)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="443"/>
+        <location filename="../core/git-access.c" line="460"/>
         <source>Problems with local cache of Subsurface cloud data</source>
         <translation>Subsurface 雲端資料於本機端的暫存錯誤</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="444"/>
+        <location filename="../core/git-access.c" line="461"/>
         <source>Moved cache data to %s. Please try the operation again.</source>
         <translation>搬移暫存資料至 %s. 請再嘗試操作. </translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="491"/>
+        <location filename="../core/git-access.c" line="508"/>
         <source>Update local storage to match cloud storage</source>
         <translation>更新本機端資料來符合雲端空間資料</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="499"/>
+        <location filename="../core/git-access.c" line="516"/>
         <source>Push local changes to cloud storage</source>
         <translation>傳送本機端修改至雲端空間</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="517"/>
+        <location filename="../core/git-access.c" line="534"/>
         <source>Try to merge local changes into cloud storage</source>
         <translation>嘗試合併本機端變更至雲端空間</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="559"/>
+        <location filename="../core/git-access.c" line="576"/>
         <source>Store data into cloud storage</source>
         <translation>儲存資料至雲端空間</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="583"/>
+        <location filename="../core/git-access.c" line="600"/>
         <source>Sync with cloud storage</source>
         <translation>雲端空間同步</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="610"/>
+        <location filename="../core/git-access.c" line="627"/>
         <source>Can&apos;t reach cloud server, working with local data</source>
         <translation>無法連結雲端伺服器, 本機端資料運作</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="623"/>
+        <location filename="../core/git-access.c" line="640"/>
         <source>Successful cloud connection, fetch remote</source>
         <translation>雲端連結成功, 取得控制</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="642"/>
+        <location filename="../core/git-access.c" line="659"/>
         <source>Done syncing with cloud storage</source>
         <translation>雲端空間同步結束</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="777"/>
+        <location filename="../core/git-access.c" line="794"/>
         <source>Error connecting to Subsurface cloud storage</source>
         <translation>錯誤連結至 Subsurface 雲端裝置</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="780"/>
+        <location filename="../core/git-access.c" line="797"/>
         <source>git clone of %s failed (%s)</source>
         <translation>git clone %s 失敗 (%s)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="806"/>
+        <location filename="../core/git-access.c" line="823"/>
         <source>Synchronising data file</source>
         <translation>同步資料檔案</translation>
     </message>
     <message>
-        <location filename="../core/import-divinglog.c" line="312"/>
-        <location filename="../core/libdivecomputer.c" line="236"/>
-        <location filename="../core/uemis-downloader.c" line="193"/>
+        <location filename="../core/import-divinglog.c" line="314"/>
+        <location filename="../core/libdivecomputer.c" line="244"/>
+        <location filename="../core/uemis-downloader.c" line="194"/>
         <source>unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="249"/>
+        <location filename="../core/libdivecomputer.c" line="257"/>
         <source>none</source>
         <translation>無</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="254"/>
+        <location filename="../core/libdivecomputer.c" line="262"/>
         <source>workload</source>
         <translation>工作量</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="256"/>
+        <location filename="../core/libdivecomputer.c" line="264"/>
         <source>violation</source>
         <translation>違反</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="257"/>
+        <location filename="../core/libdivecomputer.c" line="265"/>
         <source>bookmark</source>
         <translation>書籤</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="258"/>
+        <location filename="../core/libdivecomputer.c" line="266"/>
         <source>surface</source>
         <translation>水面</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="259"/>
+        <location filename="../core/libdivecomputer.c" line="267"/>
         <source>safety stop</source>
         <translation>安全停留</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="261"/>
+        <location filename="../core/libdivecomputer.c" line="269"/>
         <source>safety stop (voluntary)</source>
         <translation>安全停留 (非必要)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="262"/>
+        <location filename="../core/libdivecomputer.c" line="270"/>
         <source>safety stop (mandatory)</source>
         <translation>安全停留 (強制性)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="263"/>
+        <location filename="../core/libdivecomputer.c" line="271"/>
         <source>deepstop</source>
         <translation>深停留</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="264"/>
+        <location filename="../core/libdivecomputer.c" line="272"/>
         <source>ceiling (safety stop)</source>
         <translation>上限深度 (安全停留)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="265"/>
+        <location filename="../core/libdivecomputer.c" line="273"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>below floor</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="266"/>
+        <location filename="../core/libdivecomputer.c" line="274"/>
         <source>divetime</source>
         <translation>潛水時間</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="270"/>
+        <location filename="../core/libdivecomputer.c" line="278"/>
         <source>airtime</source>
         <translation>空氣時間</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="271"/>
+        <location filename="../core/libdivecomputer.c" line="279"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="272"/>
+        <location filename="../core/libdivecomputer.c" line="280"/>
         <source>heading</source>
         <translation>標題</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="273"/>
+        <location filename="../core/libdivecomputer.c" line="281"/>
         <source>tissue level warning</source>
         <translation>組織等級警告</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="283"/>
+        <location filename="../core/libdivecomputer.c" line="291"/>
         <source>invalid event number</source>
         <translation>錯誤的事件編號</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="604"/>
+        <location filename="../core/libdivecomputer.c" line="612"/>
         <source>Error parsing the datetime</source>
         <translation>日期時間解析錯誤</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="622"/>
+        <location filename="../core/libdivecomputer.c" line="630"/>
         <source>Dive %d: %s</source>
         <translation>潛水 %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="628"/>
+        <location filename="../core/libdivecomputer.c" line="636"/>
         <source>Error parsing the divetime</source>
         <translation>潛水時間解析錯誤</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="638"/>
+        <location filename="../core/libdivecomputer.c" line="646"/>
         <source>Error parsing the maxdepth</source>
         <translation>最大深度解析錯誤</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="657"/>
+        <location filename="../core/libdivecomputer.c" line="665"/>
         <source>Error parsing temperature</source>
         <translation>錯誤溫度解析</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="677"/>
+        <location filename="../core/libdivecomputer.c" line="685"/>
         <source>Error parsing the gas mix count</source>
         <translation>混合氣體數量解析錯誤</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="689"/>
+        <location filename="../core/libdivecomputer.c" line="697"/>
         <source>Error obtaining water salinity</source>
         <translation>得到錯誤的海水鹽度</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="698"/>
+        <location filename="../core/libdivecomputer.c" line="706"/>
         <source>Error obtaining surface pressure</source>
         <translation>得到錯誤的水面壓力</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="723"/>
+        <location filename="../core/libdivecomputer.c" line="731"/>
         <source>Error obtaining dive mode</source>
         <translation>取得潛水模式錯誤</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="746"/>
+        <location filename="../core/libdivecomputer.c" line="754"/>
         <source>Error parsing the gas mix</source>
         <translation>混合氣體解析錯誤</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="772"/>
+        <location filename="../core/libdivecomputer.c" line="780"/>
         <source>Unable to create parser for %s %s</source>
         <translation>無法建立解析 %s %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="778"/>
+        <location filename="../core/libdivecomputer.c" line="786"/>
         <source>Error registering the data</source>
         <translation>錯誤的登錄資料</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="799"/>
+        <location filename="../core/libdivecomputer.c" line="817"/>
         <source>Error parsing the samples</source>
         <translation>樣本解析錯誤</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="806"/>
+        <location filename="../core/libdivecomputer.c" line="824"/>
         <source>Already downloaded dive at %s</source>
         <translation>已自 %s 下載潛水</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="941"/>
+        <location filename="../core/libdivecomputer.c" line="1074"/>
         <source>Event: waiting for user action</source>
         <translation>事件: 等待使用者動作</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="960"/>
+        <location filename="../core/libdivecomputer.c" line="1093"/>
         <source>model=%s firmware=%u serial=%u</source>
         <translation>機型=%s 韌體=%u 序號=%u</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1022"/>
+        <location filename="../core/libdivecomputer.c" line="1159"/>
         <source>Error registering the event handler.</source>
         <translation>錯誤的註冊程序.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1027"/>
+        <location filename="../core/libdivecomputer.c" line="1164"/>
         <source>Error registering the cancellation handler.</source>
         <translation>錯誤的註冊取消程序.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1048"/>
+        <location filename="../core/libdivecomputer.c" line="1185"/>
         <source>Dive data import error</source>
         <translation>匯入潛水資料錯誤</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1087"/>
+        <location filename="../core/libdivecomputer.c" line="1386"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>無法建立 libdivecomputer 上下文</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1096"/>
+        <location filename="../core/libdivecomputer.c" line="1395"/>
         <source>Unable to open %s %s (%s)</source>
         <translation> 無法開啟 %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1121"/>
+        <location filename="../core/libdivecomputer.c" line="1405"/>
         <source>Error opening the device %s %s (%s).
 In most cases, in order to debug this issue, a libdivecomputer logfile will be useful.
 You can create this logfile by selecting the corresponding checkbox in the download dialog.</source>
@@ -9213,353 +9305,365 @@ You can create this logfile by selecting the corresponding checkbox in the downl
 您可以在下載頁面勾選相對應的選項, 來建立日誌檔案.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1130"/>
+        <location filename="../core/libdivecomputer.c" line="1416"/>
         <source>No new dives downloaded from dive computer</source>
         <translation>潛水電腦無新的潛水日誌下載</translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="197"/>
-        <location filename="../core/parse-xml.c" line="1139"/>
+        <location filename="../core/load-git.c" line="169"/>
+        <location filename="../core/parse-xml.c" line="1159"/>
         <source>multiple GPS locations for this dive site; also %s
 </source>
         <translation>此潛點有複數個 GPS位置; 並 %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="225"/>
-        <location filename="../core/parse.c" line="493"/>
+        <location filename="../core/load-git.c" line="197"/>
+        <location filename="../core/parse.c" line="495"/>
         <source>additional name for site: %s
 </source>
         <translation>潛點別名: %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1724"/>
+        <location filename="../core/load-git.c" line="1672"/>
         <source>Load dives from local cache</source>
         <translation>自本機端載入潛水</translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1728"/>
+        <location filename="../core/load-git.c" line="1676"/>
         <source>Successfully opened dive data</source>
         <translation>成功開啟潛水資料</translation>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="124"/>
-        <location filename="../core/ostctools.c" line="155"/>
+        <location filename="../core/ostctools.c" line="125"/>
+        <location filename="../core/ostctools.c" line="156"/>
         <source>Unknown DC in dive %d</source>
         <translation>未知 DC 於潛水 %d</translation>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="167"/>
+        <location filename="../core/ostctools.c" line="168"/>
         <source>Error - %s - parsing dive %d</source>
         <translation>錯誤 - %s - 解析潛水 %d</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="389"/>
+        <location filename="../core/parse-xml.c" line="392"/>
         <source>Strange percentage reading %s
 </source>
         <translation>有問題的讀取比例 %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="1600"/>
+        <location filename="../core/parse-xml.c" line="1624"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>無法解析訊息 &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2033"/>
+        <location filename="../core/parse-xml.c" line="2057"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>無法開啟樣式 %s</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="97"/>
+        <location filename="../core/plannernotes.c" line="112"/>
         <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>免責聲明 / 警告: 這是使用新發展的 %s 演算法, 且使用的潛水計畫僅經過有限次數的測試. 我們強烈建議不要僅使用此處模擬結果做為計畫.</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="108"/>
+        <location filename="../core/plannernotes.c" line="106"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>已超過時間，減壓計算中止</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="110"/>
-        <location filename="../core/plannernotes.c" line="468"/>
-        <location filename="../core/plannernotes.c" line="474"/>
-        <location filename="../core/plannernotes.c" line="513"/>
-        <location filename="../core/plannernotes.c" line="544"/>
-        <location filename="../core/plannernotes.c" line="572"/>
-        <location filename="../core/plannernotes.c" line="585"/>
+        <location filename="../core/plannernotes.c" line="105"/>
+        <location filename="../core/plannernotes.c" line="453"/>
+        <location filename="../core/plannernotes.c" line="459"/>
+        <location filename="../core/plannernotes.c" line="498"/>
+        <location filename="../core/plannernotes.c" line="531"/>
+        <location filename="../core/plannernotes.c" line="565"/>
+        <location filename="../core/plannernotes.c" line="576"/>
         <source>Warning:</source>
         <translation>提醒:</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="411"/>
+        <location filename="../core/plannernotes.c" line="398"/>
         <source>, effective GF=%d/%d</source>
         <translation>, effective GF=%d/%d</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="320"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/>
+        <location filename="../core/planner.c" line="327"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/>
         <source>SP change</source>
         <translation>SP 變更</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="92"/>
+        <location filename="../core/plannernotes.c" line="95"/>
         <source>VPM-B</source>
         <translation>VPM-B</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="94"/>
+        <location filename="../core/plannernotes.c" line="97"/>
         <source>BUHLMANN</source>
         <translation>BUHLMANN</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="150"/>
+        <location filename="../core/plannernotes.c" line="149"/>
         <source>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</source>
         <translation>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="155"/>
+        <location filename="../core/plannernotes.c" line="153"/>
         <source>depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="158"/>
+        <location filename="../core/plannernotes.c" line="155"/>
         <source>duration</source>
         <translation>時間</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="161"/>
-        <location filename="../core/plannernotes.c" line="173"/>
+        <location filename="../core/plannernotes.c" line="49"/>
+        <location filename="../core/plannernotes.c" line="157"/>
         <source>runtime</source>
         <translation>作業時間</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="164"/>
+        <location filename="../core/plannernotes.c" line="159"/>
         <source>gas</source>
         <translation>氣體</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="171"/>
+        <location filename="../core/plannernotes.c" line="48"/>
         <source>Isobaric counterdiffusion information</source>
-        <translation type="unfinished"/>
+        <translation>Isobaric counterdiffusion訊息</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="177"/>
+        <location filename="../core/plannernotes.c" line="51"/>
         <source>&amp;#916;He</source>
-        <translation type="unfinished"/>
+        <translation>&amp;#916;He</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="179"/>
+        <location filename="../core/plannernotes.c" line="52"/>
         <source>&amp;#916;N&amp;#8322;</source>
-        <translation type="unfinished"/>
+        <translation>&amp;#916;N&amp;#8322;</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="181"/>
+        <location filename="../core/plannernotes.c" line="53"/>
         <source>max &amp;#916;N&amp;#8322;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="231"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
-        <translation>轉換至 %.*f %s in %d:%02d min - 運行時間 %d:%02u on %s (SP = %.1fbar)</translation>
+        <translation>max &amp;#916;N&amp;#8322;</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="238"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
-        <translation>禁搭飛機 %.*f %s 在 %d:%02d min - 運行時間 %d:%02u 在 %s</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="251"/>
+        <location filename="../core/plannernotes.c" line="229"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>停留於 %.*f %s for %d:%02d min - 運行時間 %d:%02u on %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="258"/>
+        <location filename="../core/plannernotes.c" line="236"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>停留在 %.*f %s for %d:%02d min - 運作時間 %d:%02u 於 %s</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="304"/>
+        <location filename="../core/plannernotes.c" line="282"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="307"/>
-        <location filename="../core/plannernotes.c" line="311"/>
+        <location filename="../core/plannernotes.c" line="286"/>
+        <location filename="../core/plannernotes.c" line="291"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="320"/>
-        <location filename="../core/plannernotes.c" line="338"/>
+        <location filename="../core/plannernotes.c" line="301"/>
+        <location filename="../core/plannernotes.c" line="323"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="367"/>
+        <location filename="../core/plannernotes.c" line="354"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>氣體交換至 %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="369"/>
+        <location filename="../core/plannernotes.c" line="356"/>
         <source>Switch gas to %s</source>
         <translation>更換氣體至 %s</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="395"/>
+        <location filename="../core/plannernotes.c" line="385"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="397"/>
+        <location filename="../core/plannernotes.c" line="386"/>
         <source>OTU</source>
         <translation>氧容許量 OTU</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="407"/>
+        <location filename="../core/plannernotes.c" line="394"/>
         <source>Deco model: VPM-B at nominal conservatism</source>
         <translation>減壓模型: VPM-B 基於公定保守等級</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="500"/>
+        <location filename="../core/plannernotes.c" line="485"/>
         <source>Minimum gas</source>
         <translation>最低氣源</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="501"/>
+        <location filename="../core/plannernotes.c" line="486"/>
         <source>based on</source>
         <translation>根據</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="503"/>
+        <location filename="../core/plannernotes.c" line="488"/>
         <source>SAC</source>
         <translation>耗氣率</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="522"/>
+        <location filename="../core/plannernotes.c" line="507"/>
         <source>%.0f%s/%.0f%s of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt;</source>
         <translation>%.0f%s/%.0f%s of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt;</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="527"/>
+        <location filename="../core/plannernotes.c" line="512"/>
         <source>%.0f%s of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s during planned ascent)</source>
         <translation>%.0f%s of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s 計畫上升期間)</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="530"/>
+        <location filename="../core/plannernotes.c" line="515"/>
         <source>%.0f%s of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt;</source>
         <translation>%.0f%s of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt;</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="119"/>
-        <location filename="../core/plannernotes.c" line="129"/>
-        <location filename="../core/plannernotes.c" line="137"/>
+        <location filename="../core/plannernotes.c" line="121"/>
+        <location filename="../core/plannernotes.c" line="128"/>
+        <location filename="../core/plannernotes.c" line="136"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="139"/>
+        <location filename="../core/plannernotes.c" line="138"/>
         <source>dive plan&lt;/b&gt; (surface interval </source>
         <translation>潛水計畫 &lt;/b&gt; (水面區間</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="141"/>
+        <location filename="../core/plannernotes.c" line="140"/>
         <source>created on</source>
         <translation>建立於</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="131"/>
+        <location filename="../core/plannernotes.c" line="130"/>
         <source>dive plan&lt;/b&gt; created on</source>
         <translation>潛水計畫 &lt;/b&gt; 建立於</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="121"/>
+        <location filename="../core/plannernotes.c" line="123"/>
         <source>dive plan&lt;/b&gt; (overlapping dives detected)</source>
         <translation>潛水計畫&lt;/b&gt; (偵測到潛水重疊)</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="147"/>
+        <location filename="../core/plannernotes.c" line="146"/>
         <source>Runtime: %dmin%s</source>
-        <translation type="unfinished"/>
+        <translation>操作時間: %dmin%s</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="402"/>
+        <location filename="../core/plannernotes.c" line="206"/>
+        <source>%s to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
+        <translation>%s to %.*f %s in %d:%02d min - 操作時間 %d:%02u on %s (SP = %.1fbar)</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="207"/>
+        <location filename="../core/plannernotes.c" line="215"/>
+        <source>Ascend</source>
+        <translation>上升</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="207"/>
+        <location filename="../core/plannernotes.c" line="215"/>
+        <source>Descend</source>
+        <translation>下降</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="214"/>
+        <source>%s to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
+        <translation>%s to %.*f %s in %d:%02d min - 操作時間 %d:%02u on %s</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="391"/>
         <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source>
         <translation>減壓模型: Bühlmann ZHL-16C 以 GFLow = %d%% 與 GFHigh = %d%%</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="409"/>
+        <location filename="../core/plannernotes.c" line="396"/>
         <source>Deco model: VPM-B at +%d conservatism</source>
         <translation>減壓模型: VPM-B at +%d 保守等級</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="415"/>
+        <location filename="../core/plannernotes.c" line="400"/>
         <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source>
         <translation>減壓模型: 休閒模式根據 Bühlmann ZHL-16B 以 GFLow = %d%% 與 GFHigh = %d%%</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="423"/>
+        <location filename="../core/plannernotes.c" line="408"/>
         <source>ATM pressure: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</source>
         <translation>ATM 壓力: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="439"/>
+        <location filename="../core/plannernotes.c" line="423"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>氣體消耗 (排除 CCR legs):</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="441"/>
+        <location filename="../core/plannernotes.c" line="425"/>
         <source>Gas consumption (based on SAC</source>
         <translation>氣體消耗 (基於 SAC</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="469"/>
+        <location filename="../core/plannernotes.c" line="454"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>指定的氣瓶氣體超過供給量！</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="475"/>
+        <location filename="../core/plannernotes.c" line="460"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>無足夠的預留氣體可供上升使用！</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="514"/>
+        <location filename="../core/plannernotes.c" line="499"/>
         <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source>
         <translation>上升所需要最少氣源已達氣瓶的起始壓力! </translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="519"/>
+        <location filename="../core/plannernotes.c" line="504"/>
         <source>%.0f%s/%.0f%s of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s/%.0f%s 計畫上升)</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="545"/>
+        <location filename="../core/plannernotes.c" line="532"/>
         <source>Isobaric counterdiffusion conditions exceeded</source>
-        <translation type="unfinished"/>
+        <translation>已超過Isobaric counterdiffusion條件</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="569"/>
+        <location filename="../core/plannernotes.c" line="563"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>高 pO₂ 數值 %.2f 發生於 %d:%02u 使用氣體 %s 在深度 %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="582"/>
+        <location filename="../core/plannernotes.c" line="574"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>低 pO₂ 數值 %.2f 在 %d:%02u 使用氣源 %s 停留深度 %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="879"/>
+        <location filename="../core/planner.c" line="898"/>
         <source>Can&apos;t find gas %s</source>
         <translation>無法找到氣體 %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1150"/>
+        <location filename="../core/planner.c" line="1170"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1386"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9568,77 +9672,77 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1398"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1397"/>
+        <location filename="../core/profile.c" line="1404"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1400"/>
+        <location filename="../core/profile.c" line="1407"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1402"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1404"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1406"/>
+        <location filename="../core/profile.c" line="1413"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1408"/>
+        <location filename="../core/profile.c" line="1415"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1411"/>
+        <location filename="../core/profile.c" line="1418"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1451"/>
+        <location filename="../core/profile.c" line="1458"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1443"/>
+        <location filename="../core/profile.c" line="1450"/>
         <source>Safety stop: %umin @ %.0f%s
 </source>
         <translation>安全停留: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1387"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>P: %d%s (%s)
 </source>
         <translation>P: %d%s (%s)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1420"/>
+        <location filename="../core/profile.c" line="1427"/>
         <source>EAD: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
@@ -9647,7 +9751,7 @@ EADD: %d%s / %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1426"/>
+        <location filename="../core/profile.c" line="1433"/>
         <source>END: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
@@ -9656,234 +9760,240 @@ EADD: %d%s / %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1431"/>
+        <location filename="../core/profile.c" line="1438"/>
         <source>Density: %.1fg/ℓ
 </source>
         <translation>密度: %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1446"/>
+        <location filename="../core/profile.c" line="1453"/>
         <source>Safety stop: unknown time @ %.0f%s
 </source>
         <translation>安全停留: 未知時間 @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1454"/>
+        <location filename="../core/profile.c" line="1461"/>
         <source>Deco: unknown time @ %.0f%s
 </source>
         <translation>減壓: 未知時間 @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1458"/>
+        <location filename="../core/profile.c" line="1465"/>
         <source>In deco
 </source>
         <translation>減壓中
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1460"/>
+        <location filename="../core/profile.c" line="1467"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1463"/>
+        <location filename="../core/profile.c" line="1470"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1466"/>
+        <location filename="../core/profile.c" line="1473"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>減壓: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1474"/>
+        <location filename="../core/profile.c" line="1481"/>
         <source>In deco (calc)
 </source>
         <translation>減壓 (計算)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1477"/>
+        <location filename="../core/profile.c" line="1484"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL:%umin (預計)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1479"/>
+        <location filename="../core/profile.c" line="1486"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1483"/>
+        <location filename="../core/profile.c" line="1490"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1485"/>
+        <location filename="../core/profile.c" line="1492"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1488"/>
+        <location filename="../core/profile.c" line="1495"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1498"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>計算的上限深度 %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1497"/>
+        <location filename="../core/profile.c" line="1504"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>組織 %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1510"/>
+        <source>ICD in leading tissue
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/profile.c" line="1512"/>
         <source>heart rate: %d
 </source>
         <translation>心率: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1505"/>
+        <location filename="../core/profile.c" line="1514"/>
         <source>bearing: %d
 </source>
         <translation>方位: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1508"/>
+        <location filename="../core/profile.c" line="1517"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>至此的平均深度 %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1605"/>
-        <source>%sT: %d:%02d min</source>
-        <translation>%sT: %d:%02d min</translation>
+        <location filename="../core/profile.c" line="1614"/>
+        <source>%sT:%d:%02dmin</source>
+        <translation>%sT:%d:%02dmin</translation>
+    </message>
+    <message>
+        <location filename="../core/profile.c" line="1649"/>
+        <source>%s %sP:%d%s</source>
+        <translation>%s %sP:%d%s</translation>
+    </message>
+    <message>
+        <location filename="../core/profile.c" line="1674"/>
+        <source>%s SAC:%.*f%s/min</source>
+        <translation>%s SAC:%.*f%s/min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1609"/>
-        <location filename="../core/profile.c" line="1613"/>
-        <location filename="../core/profile.c" line="1617"/>
+        <location filename="../core/profile.c" line="1618"/>
+        <location filename="../core/profile.c" line="1622"/>
+        <location filename="../core/profile.c" line="1626"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1621"/>
+        <location filename="../core/profile.c" line="1630"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1625"/>
+        <location filename="../core/profile.c" line="1634"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1629"/>
-        <location filename="../core/profile.c" line="1633"/>
+        <location filename="../core/profile.c" line="1638"/>
+        <location filename="../core/profile.c" line="1642"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1640"/>
-        <source>%s %sP:%d %s</source>
-        <translation>%s %sP:%d %s</translation>
-    </message>
-    <message>
-        <location filename="../core/profile.c" line="1665"/>
-        <source>%s SAC: %.*f%s</source>
-        <translation>%s SAC: %.*f%s</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="60"/>
+        <location filename="../core/qthelper.cpp" line="66"/>
         <source>%1km</source>
         <translation>%1km</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="62"/>
+        <location filename="../core/qthelper.cpp" line="68"/>
         <source>%1m</source>
         <translation>%1m</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="66"/>
+        <location filename="../core/qthelper.cpp" line="72"/>
         <source>%1mi</source>
         <translation>%1mi</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="68"/>
+        <location filename="../core/qthelper.cpp" line="74"/>
         <source>%1yd</source>
         <translation>%1yd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="84"/>
-        <location filename="../core/qthelper.cpp" line="219"/>
+        <location filename="../core/qthelper.cpp" line="90"/>
+        <location filename="../core/qthelper.cpp" line="225"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="84"/>
-        <location filename="../core/qthelper.cpp" line="220"/>
+        <location filename="../core/qthelper.cpp" line="90"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="85"/>
-        <location filename="../core/qthelper.cpp" line="221"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="85"/>
-        <location filename="../core/qthelper.cpp" line="222"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="628"/>
+        <location filename="../core/qthelper.cpp" line="617"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="631"/>
+        <location filename="../core/qthelper.cpp" line="620"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="960"/>
+        <location filename="../core/qthelper.cpp" line="948"/>
         <source>more than %1 days</source>
         <translation>超過 %1 日</translation>
     </message>
     <message>
         <location filename="../core/save-html.c" line="472"/>
         <location filename="../core/save-html.c" line="556"/>
-        <location filename="../core/worldmap-save.c" line="114"/>
+        <location filename="../core/worldmap-save.c" line="113"/>
         <source>Can&apos;t open file %s</source>
         <translation>無法開啟檔案 %s</translation>
     </message>
@@ -9984,8 +10094,8 @@ EADD: %d%s / %.1fg/ℓ
     </message>
     <message>
         <location filename="../core/save-html.c" line="512"/>
-        <location filename="../smtk-import/smartrak.c" line="295"/>
-        <location filename="../smtk-import/smartrak.c" line="368"/>
+        <location filename="../smtk-import/smartrak.c" line="296"/>
+        <location filename="../smtk-import/smartrak.c" line="369"/>
         <source>Notes</source>
         <translation>記錄</translation>
     </message>
@@ -10156,127 +10266,92 @@ EADD: %d%s / %.1fg/ℓ
         <translation>潛水狀態</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="142"/>
+        <location filename="../core/statistics.c" line="141"/>
         <source>All (by type stats)</source>
         <translation>全部 (依據統計種類)</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="144"/>
-        <source>OC</source>
-        <translation>OC</translation>
-    </message>
-    <message>
-        <location filename="../core/statistics.c" line="146"/>
+        <location filename="../core/dive.c" line="42"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="148"/>
+        <location filename="../core/dive.c" line="43"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="150"/>
+        <location filename="../core/dive.c" line="44"/>
         <source>Freedive</source>
         <translation>自由潛水</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="195"/>
+        <location filename="../core/statistics.c" line="194"/>
         <source>All (by trip stats)</source>
         <translation>全部 (根據旅程資訊)</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="245"/>
-        <source>for dives #</source>
-        <translation>針對潛水 #</translation>
-    </message>
-    <message>
-        <location filename="../core/statistics.c" line="251"/>
-        <source>for selected dives</source>
-        <translation>針對選擇的潛水</translation>
-    </message>
-    <message>
-        <location filename="../core/statistics.c" line="286"/>
-        <source>for dive #%d</source>
-        <translation>針對潛水 #%d</translation>
-    </message>
-    <message>
-        <location filename="../core/statistics.c" line="288"/>
-        <source>for selected dive</source>
-        <translation>針對選擇的潛水</translation>
-    </message>
-    <message>
-        <location filename="../core/statistics.c" line="290"/>
-        <source>for all dives</source>
-        <translation>針對所有潛水</translation>
-    </message>
-    <message>
-        <location filename="../core/statistics.c" line="292"/>
-        <source>(no dives)</source>
-        <translation>(無潛水)</translation>
-    </message>
-    <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>1月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>2月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>3月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>4月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>5月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>6月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="131"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>7月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="131"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>8月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="131"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>9月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="131"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>10月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="131"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>11月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="131"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>12月</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="28"/>
+        <location filename="../core/uemis-downloader.c" line="29"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
@@ -10285,7 +10360,7 @@ and click &apos;Retry&apos;</source>
 並點選 &apos;重試&apos;</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="29"/>
+        <location filename="../core/uemis-downloader.c" line="30"/>
         <source>Uemis Zurich: the file system is full.
 Disconnect/reconnect the dive computer
 and click Retry</source>
@@ -10294,321 +10369,321 @@ and click Retry</source>
 並點選 &apos;重試&apos;</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="30"/>
+        <location filename="../core/uemis-downloader.c" line="31"/>
         <source>Short write to req.txt file.
 Is the Uemis Zurich plugged in correctly?</source>
         <translation>嘗試寫入 req.txt 檔案。
 Uemis Zurich 已正確插入？</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="31"/>
+        <location filename="../core/uemis-downloader.c" line="32"/>
         <source>No dives to download.</source>
         <translation>無潛水記錄可下載. </translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="507"/>
+        <location filename="../core/uemis-downloader.c" line="508"/>
         <source>%s %s</source>
         <translation>%s %s</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="527"/>
+        <location filename="../core/uemis-downloader.c" line="528"/>
         <source>data</source>
         <translation>資料</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="555"/>
+        <location filename="../core/uemis-downloader.c" line="556"/>
         <source>dive log #</source>
         <translation>潛水日誌 #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="557"/>
+        <location filename="../core/uemis-downloader.c" line="558"/>
         <source>dive spot #</source>
         <translation>潛點 #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="559"/>
+        <location filename="../core/uemis-downloader.c" line="560"/>
         <source>details for #</source>
         <translation># 細節</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="789"/>
+        <location filename="../core/uemis-downloader.c" line="790"/>
         <source>wetsuit</source>
         <translation>濕式防寒衣</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="789"/>
+        <location filename="../core/uemis-downloader.c" line="790"/>
         <source>semidry</source>
         <translation>半乾衣</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="789"/>
+        <location filename="../core/uemis-downloader.c" line="790"/>
         <source>drysuit</source>
         <translation>乾式防寒衣</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="790"/>
+        <location filename="../core/uemis-downloader.c" line="791"/>
         <source>shorty</source>
         <translation>短袖防寒衣</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="790"/>
+        <location filename="../core/uemis-downloader.c" line="791"/>
         <source>vest</source>
         <translation>背心</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="790"/>
+        <location filename="../core/uemis-downloader.c" line="791"/>
         <source>long john</source>
         <translation>長約翰式</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="790"/>
+        <location filename="../core/uemis-downloader.c" line="791"/>
         <source>jacket</source>
         <translation>夾克式</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="790"/>
+        <location filename="../core/uemis-downloader.c" line="791"/>
         <source>full suit</source>
         <translation>全身式防寒衣</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="790"/>
+        <location filename="../core/uemis-downloader.c" line="791"/>
         <source>2 pcs full suit</source>
         <translation>2 件式防寒衣</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="791"/>
+        <location filename="../core/uemis-downloader.c" line="792"/>
         <source>membrane</source>
         <translation>膜組織</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1328"/>
+        <location filename="../core/uemis-downloader.c" line="1329"/>
         <source>Initialise communication</source>
         <translation>通訊初始化</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1331"/>
+        <location filename="../core/uemis-downloader.c" line="1332"/>
         <source>Uemis init failed</source>
         <translation>Uemis 初始化失敗</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1343"/>
+        <location filename="../core/uemis-downloader.c" line="1344"/>
         <source>Start download</source>
         <translation>開始下載</translation>
     </message>
     <message>
-        <location filename="../core/uemis.c" line="202"/>
+        <location filename="../core/uemis.c" line="201"/>
         <source>Safety stop violation</source>
         <translation>違反安全停留</translation>
     </message>
     <message>
-        <location filename="../core/uemis.c" line="204"/>
+        <location filename="../core/uemis.c" line="203"/>
         <source>Speed alarm</source>
         <translation>速度提醒</translation>
     </message>
     <message>
-        <location filename="../core/uemis.c" line="207"/>
+        <location filename="../core/uemis.c" line="206"/>
         <source>Speed warning</source>
         <translation>速度警告</translation>
     </message>
     <message>
-        <location filename="../core/uemis.c" line="209"/>
+        <location filename="../core/uemis.c" line="208"/>
         <source>pO₂ green warning</source>
         <translation>pO₂ 安全提醒</translation>
     </message>
     <message>
-        <location filename="../core/uemis.c" line="212"/>
+        <location filename="../core/uemis.c" line="211"/>
         <source>pO₂ ascend warning</source>
         <translation>pO₂ 上升提醒</translation>
     </message>
     <message>
-        <location filename="../core/uemis.c" line="214"/>
+        <location filename="../core/uemis.c" line="213"/>
         <source>pO₂ ascend alarm</source>
         <translation>pO₂ 上升警告</translation>
     </message>
     <message>
-        <location filename="../core/uemis.c" line="218"/>
+        <location filename="../core/uemis.c" line="217"/>
         <source>Tank pressure info</source>
         <translation>氣瓶壓力資訊</translation>
     </message>
     <message>
-        <location filename="../core/uemis.c" line="220"/>
+        <location filename="../core/uemis.c" line="219"/>
         <source>RGT warning</source>
         <translation>RGT 提醒</translation>
     </message>
     <message>
-        <location filename="../core/uemis.c" line="222"/>
+        <location filename="../core/uemis.c" line="221"/>
         <source>RGT alert</source>
         <translation>RGT 警告</translation>
     </message>
     <message>
-        <location filename="../core/uemis.c" line="224"/>
+        <location filename="../core/uemis.c" line="223"/>
         <source>Tank change suggested</source>
         <translation>建議氣瓶更換</translation>
     </message>
     <message>
-        <location filename="../core/uemis.c" line="226"/>
+        <location filename="../core/uemis.c" line="225"/>
         <source>Depth limit exceeded</source>
         <translation>超過潛水深度限制</translation>
     </message>
     <message>
-        <location filename="../core/uemis.c" line="228"/>
+        <location filename="../core/uemis.c" line="227"/>
         <source>Max deco time warning</source>
         <translation>最大減壓時間提醒</translation>
     </message>
     <message>
-        <location filename="../core/uemis.c" line="230"/>
+        <location filename="../core/uemis.c" line="229"/>
         <source>Dive time info</source>
         <translation>潛水時間資訊</translation>
     </message>
     <message>
-        <location filename="../core/uemis.c" line="232"/>
+        <location filename="../core/uemis.c" line="231"/>
         <source>Dive time alert</source>
         <translation>潛水時間警告</translation>
     </message>
     <message>
-        <location filename="../core/uemis.c" line="234"/>
+        <location filename="../core/uemis.c" line="233"/>
         <source>Marker</source>
         <translation>標記</translation>
     </message>
     <message>
-        <location filename="../core/uemis.c" line="236"/>
+        <location filename="../core/uemis.c" line="235"/>
         <source>No tank data</source>
         <translation>無氣瓶資料</translation>
     </message>
     <message>
-        <location filename="../core/uemis.c" line="238"/>
+        <location filename="../core/uemis.c" line="237"/>
         <source>Low battery warning</source>
         <translation>低電量提醒</translation>
     </message>
     <message>
-        <location filename="../core/uemis.c" line="240"/>
+        <location filename="../core/uemis.c" line="239"/>
         <source>Low battery alert</source>
         <translation>低電量警告</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="42"/>
+        <location filename="../core/worldmap-save.c" line="41"/>
         <source>Date:</source>
         <translation>日期:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="44"/>
+        <location filename="../core/worldmap-save.c" line="43"/>
         <source>Time:</source>
         <translation>時間:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="46"/>
+        <location filename="../core/worldmap-save.c" line="45"/>
         <source>Duration:</source>
         <translation>時間:</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="48"/>
-        <location filename="../core/plannernotes.c" line="505"/>
-        <location filename="../core/worldmap-save.c" line="47"/>
+        <location filename="../core/plannernotes.c" line="58"/>
+        <location filename="../core/plannernotes.c" line="490"/>
+        <location filename="../core/worldmap-save.c" line="46"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="50"/>
+        <location filename="../core/worldmap-save.c" line="49"/>
         <source>Max. depth:</source>
         <translation>最大深度</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="53"/>
+        <location filename="../core/worldmap-save.c" line="52"/>
         <source>Air temp.:</source>
         <translation>氣溫：</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="56"/>
+        <location filename="../core/worldmap-save.c" line="55"/>
         <source>Water temp.:</source>
         <translation>水溫：</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="58"/>
+        <location filename="../core/worldmap-save.c" line="57"/>
         <source>Location:</source>
         <translation>位置:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="62"/>
+        <location filename="../core/worldmap-save.c" line="61"/>
         <source>Notes:</source>
         <translation>記錄:</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="291"/>
+        <location filename="../smtk-import/smartrak.c" line="292"/>
         <source>Built</source>
         <translation>建造</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="291"/>
+        <location filename="../smtk-import/smartrak.c" line="292"/>
         <source>Sank</source>
         <translation>沉沒</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="291"/>
+        <location filename="../smtk-import/smartrak.c" line="292"/>
         <source>Sank Time</source>
         <translation>下潛時間</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="292"/>
+        <location filename="../smtk-import/smartrak.c" line="293"/>
         <source>Reason</source>
         <translation>理由</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="292"/>
+        <location filename="../smtk-import/smartrak.c" line="293"/>
         <source>Nationality</source>
         <translation>國籍</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="292"/>
+        <location filename="../smtk-import/smartrak.c" line="293"/>
         <source>Shipyard</source>
         <translation>船廠</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="293"/>
+        <location filename="../smtk-import/smartrak.c" line="294"/>
         <source>ShipType</source>
         <translation>船隻種類</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="293"/>
+        <location filename="../smtk-import/smartrak.c" line="294"/>
         <source>Length</source>
         <translation>長度</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="293"/>
+        <location filename="../smtk-import/smartrak.c" line="294"/>
         <source>Beam</source>
         <translation>橫樑</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="294"/>
+        <location filename="../smtk-import/smartrak.c" line="295"/>
         <source>Draught</source>
         <translation>草案</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="294"/>
+        <location filename="../smtk-import/smartrak.c" line="295"/>
         <source>Displacement</source>
         <translation>移位</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="294"/>
+        <location filename="../smtk-import/smartrak.c" line="295"/>
         <source>Cargo</source>
         <translation>船艙</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="306"/>
+        <location filename="../smtk-import/smartrak.c" line="307"/>
         <source>Wreck Data</source>
         <translation>沈船資料</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="367"/>
+        <location filename="../smtk-import/smartrak.c" line="368"/>
         <source>Altitude</source>
         <translation>海拔</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="367"/>
+        <location filename="../smtk-import/smartrak.c" line="368"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveprofileitem.cpp" line="198"/>
+        <location filename="../profile-widget/diveprofileitem.cpp" line="190"/>
         <source>planned waypoint above ceiling</source>
         <translation>根據深度計畫路徑點</translation>
     </message>
@@ -10648,25 +10723,30 @@ Uemis Zurich 已正確插入？</translation>
         <translation>城市</translation>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="958"/>
+        <location filename="../core/save-git.c" line="955"/>
         <source>Start saving data</source>
         <translation>開始儲存資料</translation>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="967"/>
+        <location filename="../core/save-git.c" line="964"/>
         <source>Start saving dives</source>
         <translation>開始儲存潛水記錄</translation>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="1000"/>
+        <location filename="../core/save-git.c" line="997"/>
         <source>Done creating local cache</source>
         <translation>分配本機端空間成功</translation>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="1248"/>
+        <location filename="../core/save-git.c" line="1245"/>
         <source>Preparing to save data</source>
         <translation>準備儲存資料</translation>
     </message>
+    <message>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1627"/>
+        <source>modechange</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>main</name>
@@ -10676,122 +10756,124 @@ Uemis Zurich 已正確插入？</translation>
         <translation>Subsurface-mobile</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="109"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="121"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="120"/>
         <source>Dive list</source>
         <translation>潛水列表</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="147"/>
         <source>Dive management</source>
         <translation>潛水管理</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="268"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="209"/>
+        <source>Disable auto cloud sync</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="209"/>
+        <source>Enable auto cloud sync</source>
+        <translation>啟動自動雲端同步</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="278"/>
         <source>Disable location service</source>
         <translation>關閉定位功能</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="290"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="300"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="144"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="152"/>
         <source>Add dive manually</source>
         <translation>手動增加潛水</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="157"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="166"/>
         <source>Download from DC</source>
         <translation>自潛水電腦下載</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="178"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>Manual sync with cloud</source>
         <translation>手動雲端同步</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
-        <source>Offline mode</source>
-        <translation>離線模式</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="214"/>
         <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose &apos;Manual sync with cloud&apos; if you have network connectivity and want to sync your data to cloud storage.</source>
         <translation>關閉雲端自動同步會使資料僅能在本機端使用. 在無網路連結情況下, 此為有效的解決對策. 若有網路連結, 需要同步資料至雲端, 請選擇 &apos;手動雲端同步&apos;. </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="225"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="323"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="333"/>
         <source>Help</source>
         <translation>幫助</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
         <source>Upload GPS data</source>
         <translation>上傳 GPS 資料</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="169"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="178"/>
         <source>Apply GPS fixes</source>
         <translation>套入GPS座標點</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
-        <source>Auto cloud sync enabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="233"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="243"/>
         <source>Download GPS data</source>
         <translation>下載 GPS 資料</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="244"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="254"/>
         <source>Show GPS fixes</source>
         <translation>顯示 GPS 位置</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="257"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="267"/>
         <source>Clear GPS cache</source>
         <translation>清除 GPS 暫存</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="301"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="311"/>
         <source>Developer</source>
         <translation>開發人員</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="314"/>
         <source>App log</source>
         <translation>App 日誌</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="312"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="322"/>
         <source>Theme information</source>
         <translation>主題資訊</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="279"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="289"/>
         <source>About</source>
         <translation>關於</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="268"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="278"/>
         <source>Run location service</source>
         <translation>啟動位置服務</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/main.qml" line="28"/>
+        <location filename="../mobile-widgets/qml/kirigami/examples/qmakewithstaticplugin/src/main.qml" line="28"/>
+        <location filename="../mobile-widgets/qml/kirigami/examples/staticcmake/src/main.qml" line="28"/>
         <source>Hello World</source>
         <translation>您好</translation>
     </message>