Latest translations

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
author: Dirk Hohndel <dirk@hohndel.org> 2015-10-08 13:11:26 +0100
committer: Dirk Hohndel <dirk@hohndel.org> 2015-10-08 13:11:26 +0100
commit: 640c746a1faa77ea13c93582c59b391f7e2816de (patch)
tree: 80fa00ea8394e29408295caa9e89c13bb8c188bf /translations/subsurface_zh_TW.ts
parent: 4ed418dcc2072936d1629422be2190123fedce65 (diff)
download: subsurface-640c746a1faa77ea13c93582c59b391f7e2816de.tar.gz
1 files changed, 1187 insertions, 1124 deletions
diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts
index 409eb8dab..660496337 100644
--- a/translations/subsurface_zh_TW.ts
+++ b/translations/subsurface_zh_TW.ts
@@ -4,266 +4,266 @@
     <message>
         <location filename="../qt-ui/btdeviceselectiondialog.ui" line="14"/>
         <source>Remote Bluetooth device selection</source>
-        <translation type="unfinished"/>
+        <translation>選取遠端藍芽裝置</translation>
     </message>
     <message>
         <location filename="../qt-ui/btdeviceselectiondialog.ui" line="32"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="28"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="35"/>
         <source>Discovered devices</source>
-        <translation type="unfinished"/>
+        <translation>發現的裝置</translation>
     </message>
     <message>
         <location filename="../qt-ui/btdeviceselectiondialog.ui" line="41"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="31"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="38"/>
         <source>Save</source>
         <translation>儲存</translation>
     </message>
     <message>
         <location filename="../qt-ui/btdeviceselectiondialog.ui" line="54"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="32"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="39"/>
         <source>Quit</source>
         <translation>結束</translation>
     </message>
     <message>
         <location filename="../qt-ui/btdeviceselectiondialog.ui" line="83"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="29"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="36"/>
         <source>Scan</source>
-        <translation type="unfinished"/>
+        <translation>掃描</translation>
     </message>
     <message>
         <location filename="../qt-ui/btdeviceselectiondialog.ui" line="96"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="30"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="37"/>
         <source>Clear</source>
-        <translation type="unfinished"/>
+        <translation>清除</translation>
     </message>
     <message>
         <location filename="../qt-ui/btdeviceselectiondialog.ui" line="119"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="22"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="29"/>
         <source>Local Bluetooth device details</source>
-        <translation type="unfinished"/>
+        <translation>本地端藍芽裝置細節</translation>
     </message>
     <message>
         <location filename="../qt-ui/btdeviceselectiondialog.ui" line="128"/>
         <source>Name: </source>
-        <translation type="unfinished"/>
+        <translation>名字: </translation>
     </message>
     <message>
         <location filename="../qt-ui/btdeviceselectiondialog.ui" line="142"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="24"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="31"/>
         <source>Address:</source>
-        <translation type="unfinished"/>
+        <translation>地址: </translation>
     </message>
     <message>
         <location filename="../qt-ui/btdeviceselectiondialog.ui" line="171"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="26"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="33"/>
         <source>Bluetooth powered on</source>
-        <translation type="unfinished"/>
+        <translation>開啟藍芽電源</translation>
     </message>
     <message>
         <location filename="../qt-ui/btdeviceselectiondialog.ui" line="193"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="27"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="34"/>
         <source>Turn on/off</source>
-        <translation type="unfinished"/>
+        <translation>開啟/關閉</translation>
     </message>
     <message>
         <location filename="../qt-ui/btdeviceselectiondialog.ui" line="203"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="23"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="30"/>
         <source>Select device:</source>
-        <translation type="unfinished"/>
+        <translation>選擇裝置: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="25"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="32"/>
         <source>Name:</source>
-        <translation type="unfinished"/>
+        <translation>名稱: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="128"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="135"/>
         <source>Trying to turn on the local Bluetooth device...</source>
-        <translation type="unfinished"/>
+        <translation>嘗試開啟本地端藍芽裝置...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="131"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="138"/>
         <source>Trying to turn off the local Bluetooth device...</source>
-        <translation type="unfinished"/>
+        <translation>嘗試關閉本地端藍芽裝置...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="177"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="184"/>
         <source>Scanning for remote devices...</source>
-        <translation type="unfinished"/>
+        <translation>掃描遠端裝置...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="186"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="193"/>
         <source>Scanning finished successfully.</source>
-        <translation type="unfinished"/>
+        <translation>掃描完成</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="219"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="333"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="353"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="226"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="340"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="360"/>
         <source>UNPAIRED</source>
-        <translation type="unfinished"/>
+        <translation>未配對</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="223"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="338"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="351"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="230"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="345"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="358"/>
         <source>PAIRED</source>
-        <translation type="unfinished"/>
+        <translation>配對</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="226"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="343"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="352"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="233"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="350"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="359"/>
         <source>AUTHORIZED_PAIRED</source>
-        <translation type="unfinished"/>
+        <translation>合法配對</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="230"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="237"/>
         <source>%1 (%2)   [State: %3]</source>
-        <translation type="unfinished"/>
+        <translation>%1 (%2)   [狀態: %3]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="247"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="254"/>
         <source>The device %1 can be used for connection. You can press the Save button.</source>
-        <translation type="unfinished"/>
+        <translation>裝置 %1 可接受連線. 按下儲存按鈕繼續. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="256"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="369"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="263"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="376"/>
         <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source>
-        <translation type="unfinished"/>
+        <translation>裝置 %1 必須被配對後才能使用. 請於選單找尋配對選項. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="280"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="287"/>
         <source>The local device was changed.</source>
-        <translation type="unfinished"/>
+        <translation>本地端裝置被改變. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="300"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="307"/>
         <source>Pair</source>
-        <translation type="unfinished"/>
+        <translation>配對</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="346"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="353"/>
         <source>Device %1 was paired and is authorized.</source>
-        <translation type="unfinished"/>
+        <translation>裝置 %1 以配對且授權成功. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="50"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="57"/>
         <source>Could not initialize Winsock version 2.2</source>
-        <translation type="unfinished"/>
+        <translation>Winsock 2.2 無法成功初始化</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="161"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="168"/>
         <source>Remote devices list was cleared.</source>
-        <translation type="unfinished"/>
+        <translation>遠端裝置表單被清除. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="202"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="209"/>
         <source>The local Bluetooth device was %1.</source>
         <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation type="unfinished"/>
+        <translation>%1 是本地端藍芽裝置. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="203"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="210"/>
         <source>turned on</source>
-        <translation type="unfinished"/>
+        <translation>開啟</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="203"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="210"/>
         <source>turned off</source>
-        <translation type="unfinished"/>
+        <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="301"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="308"/>
         <source>Remove pairing</source>
-        <translation type="unfinished"/>
+        <translation>移除配對</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="317"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="324"/>
         <source>Trying to pair device %1</source>
-        <translation type="unfinished"/>
+        <translation>嘗試配對裝置 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="321"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="328"/>
         <source>Trying to unpair device %1</source>
-        <translation type="unfinished"/>
+        <translation>嘗試中止配對裝置 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="334"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="341"/>
         <source>Device %1 was unpaired.</source>
-        <translation type="unfinished"/>
+        <translation>裝置 %1 未配對. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="341"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="348"/>
         <source>Device %1 was paired.</source>
-        <translation type="unfinished"/>
+        <translation>裝置 %1 已配對. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="372"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="379"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
-        <translation type="unfinished"/>
+        <translation>裝置 %1 現在已可接受連線. 可按下儲存按鈕繼續. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="384"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="391"/>
         <source>Local device error: %1.</source>
-        <translation type="unfinished"/>
+        <translation>本地端裝置錯誤: %1. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="385"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="392"/>
         <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source>
-        <translation type="unfinished"/>
+        <translation>配對錯誤. 若是遠端裝置需要自定 PIN 碼, 請嘗試於您的作業系統先進行配對. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="387"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="394"/>
         <source>Unknown error</source>
-        <translation type="unfinished"/>
+        <translation>未知錯誤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="396"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="403"/>
         <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source>
-        <translation type="unfinished"/>
+        <translation>藍芽配接器電源已被關閉, 請開啟電源以進行搜尋. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="399"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="406"/>
         <source>Writing to or reading from the device resulted in an error.</source>
-        <translation type="unfinished"/>
+        <translation>寫入或讀出裝置造成錯誤. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="405"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="412"/>
         <source>An unknown error has occurred.</source>
-        <translation type="unfinished"/>
+        <translation>發生未知錯誤. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="410"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="417"/>
         <source>Device discovery error: %1.</source>
-        <translation type="unfinished"/>
+        <translation>裝置發生錯誤: %1.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="438"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="445"/>
         <source>Not available</source>
-        <translation type="unfinished"/>
+        <translation>不可用</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="445"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="452"/>
         <source>The local Bluetooth adapter cannot be accessed.</source>
-        <translation type="unfinished"/>
+        <translation>無法連接本地端藍芽配接器. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="495"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="502"/>
         <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source>
-        <translation type="unfinished"/>
+        <translation>因為位址 %1 無法符合本地端藍芽裝置的實體配接器位置, 裝置代理無法被建立. </translation>
     </message>
 </context>
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="606"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Person: </source>
         <translation>人名：</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="607"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
         <source>Searches for buddies and divemasters</source>
         <translation>搜尋潛伴與潛導</translation>
     </message>
@@ -386,67 +386,67 @@
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>Sample time</source>
-        <translation>樣本時間</translation>
+        <translation>取樣時間</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>Sample depth</source>
-        <translation>樣本深度</translation>
+        <translation>取樣深度</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>Sample temperature</source>
-        <translation>樣本溫度</translation>
+        <translation>取樣溫度</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>Sample pO₂</source>
-        <translation>樣本pO₂</translation>
+        <translation>取樣 pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>Sample CNS</source>
-        <translation>樣本CNS</translation>
+        <translation>取樣 CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>Sample NDL</source>
-        <translation>樣本NDL</translation>
+        <translation>取樣 NDL</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="40"/>
         <source>Sample TTS</source>
-        <translation>樣本TTS</translation>
+        <translation>取樣 TTS</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="40"/>
         <source>Sample stopdepth</source>
-        <translation>樣本停留深度</translation>
+        <translation>取樣停留深度</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="40"/>
         <source>Sample pressure</source>
-        <translation>樣本壓力</translation>
+        <translation>取樣壓力</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="41"/>
         <source>Sample sensor1 pO₂</source>
-        <translation type="unfinished"/>
+        <translation>取樣感測器 1 pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="41"/>
         <source>Sample sensor2 pO₂</source>
-        <translation type="unfinished"/>
+        <translation>取樣感測器 2 pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="41"/>
         <source>Sample sensor3 pO₂</source>
-        <translation type="unfinished"/>
+        <translation>取樣感測器 3 pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="42"/>
         <source>Sample setpoint</source>
-        <translation type="unfinished"/>
+        <translation>取樣設定點</translation>
     </message>
 </context>
 <context>
@@ -556,8 +556,8 @@
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="253"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1781"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1419"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1795"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1616"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1764"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1781"/>
@@ -566,8 +566,8 @@
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="297"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1500"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1797"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1514"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1811"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
@@ -576,8 +576,8 @@
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="320"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1523"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1820"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1537"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1834"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
@@ -585,9 +585,9 @@
         <translation>韌體版本</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="337"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1557"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1837"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="518"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1571"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1851"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
@@ -595,7 +595,7 @@
         <translation>自訂文字格式</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="360"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="337"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
         <source>Language</source>
         <translation>語言</translation>
@@ -625,88 +625,88 @@
         <translation>Italian</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="555"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
         <source>Dive mode</source>
         <translation>潛水模式</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="371"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="566"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
         <source>OC</source>
         <translation>OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="376"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="571"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
         <source>CC</source>
         <translation>CC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="381"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2064"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="576"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2078"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
         <source>Gauge</source>
         <translation>Gauge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="386"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="581"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
         <source>Apnea</source>
         <translation>Apnea</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="423"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1965"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1979"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
         <source>Date format</source>
         <translation>日期格式</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
         <source>MMDDYY</source>
         <translation>MMDDYY</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="410"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="353"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/>
         <source>DDMMYY</source>
         <translation>DDMMYY</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/>
         <source>YYMMDD</source>
         <translation>YYMMDD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="912"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2185"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="926"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2199"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
         <source>Saturation</source>
         <translation>飽和</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="696"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="719"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="745"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="797"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="863"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="889"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="971"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="987"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1294"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2006"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2110"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2136"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2162"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2202"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2225"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="710"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="733"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="759"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="811"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="877"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="903"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="985"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1001"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1308"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2124"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2150"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2176"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2216"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2239"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
@@ -725,78 +725,78 @@
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="735"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1989"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="749"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2003"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
         <source>Desaturation</source>
         <translation>未飽和</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="853"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2126"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="867"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2140"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
         <source>Last deco</source>
         <translation>最後減壓</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="774"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2035"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="788"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2049"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
         <source> m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="395"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
         <source>Brightness</source>
         <translation>亮度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="434"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="367"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
         <source>Eco</source>
         <translation>Eco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="439"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="372"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
         <source>Medium</source>
         <translation>中</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="444"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="377"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
         <source>High</source>
         <translation>高</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="569"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1955"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="589"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1969"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
         <source>Sampling rate</source>
         <translation>取樣速率</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="600"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
         <source>2s</source>
         <translation>2s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="498"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1613"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1627"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/>
         <source>10s</source>
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1694"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1708"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
         <source>Units</source>
@@ -815,51 +815,51 @@
         <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="610"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="613"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
         <source>Dive mode color</source>
         <translation>潛水模式顏色</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="580"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="624"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1608"/>
         <source>Standard</source>
         <translation>標準</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="585"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="629"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1609"/>
         <source>Red</source>
         <translation>紅色</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="590"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="634"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1610"/>
         <source>Green</source>
         <translation>綠色</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="595"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="639"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1611"/>
         <source>Blue</source>
         <translation>藍色</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="415"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
         <source>Salinity (0-5%)</source>
         <translation>鹽度 (0-5%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1889"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1903"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1770"/>
         <source>Sync dive computer time with PC</source>
         <translation>同步潛水電腦時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="508"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
         <source>Compass gain</source>
         <translation>羅盤增益</translation>
@@ -883,70 +883,70 @@
         <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="442"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
         <source>230LSB/Gauss</source>
         <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="518"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="447"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
         <source>330LSB/Gauss</source>
         <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="523"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="452"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
         <source>390LSB/Gauss</source>
         <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="528"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="457"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
         <source>440LSB/Gauss</source>
         <translation>440LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="533"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="462"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
         <source>660LSB/Gauss</source>
         <translation>660LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
         <source>820LSB/Gauss</source>
         <translation>820LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="543"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="472"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
         <source>1090LSB/Gauss</source>
         <translation>1090LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="548"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="477"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
         <source>1370LSB/Gauss</source>
         <translation>1370LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="620"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1896"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1910"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
         <source>Show safety stop</source>
         <translation>顯示安全停留</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="630"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="501"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
         <source>Reset device to default settings</source>
         <translation>重置裝置至原始設定</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="668"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1982"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="682"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1996"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1617"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1782"/>
         <source>Alt GF can be selected underwater</source>
@@ -959,68 +959,68 @@
         <translation>Suunto Vyper家族</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="648"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1976"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1990"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
         <source>Advanced settings</source>
         <translation>進階設定</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="675"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1999"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="689"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2013"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1783"/>
         <source>Future TTS</source>
         <translation>未來TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="682"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="696"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1619"/>
         <source>Pressure sensor offset</source>
         <translation>壓力感測器位移</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="689"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2218"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="703"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2232"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1620"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1809"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="712"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2195"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="726"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2209"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1622"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1808"/>
         <source>GFHigh</source>
         <translation>GFhigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="787"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="801"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2062"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1787"/>
         <source>Decotype</source>
         <translation>減壓模式</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="813"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1629"/>
         <source> mbar</source>
         <translation> mbar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="843"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2097"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="857"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2111"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="830"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2059"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="844"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2073"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1792"/>
         <source>ZH-L16</source>
@@ -1029,7 +1029,7 @@
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="47"/>
         <source>Connect via Bluetooth</source>
-        <translation type="unfinished"/>
+        <translation>透過藍芽連接</translation>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="163"/>
@@ -1038,79 +1038,79 @@
         <translation>儲存 libdivecomputer 日誌檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="668"/>
         <source>Left button sensitivity</source>
-        <translation type="unfinished"/>
+        <translation>左邊按鈕靈敏度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="675"/>
         <source>Always show ppO2</source>
-        <translation type="unfinished"/>
+        <translation>總是顯示 ppO2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="835"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="849"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="879"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2152"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="893"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2166"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1802"/>
         <source>Alt GFLow</source>
         <translation>Alt GF低</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="905"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2178"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="919"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2192"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1641"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1804"/>
         <source>Alt GFHigh</source>
         <translation>Alt GF高</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="922"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="936"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
         <translation>翻轉螢幕</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="929"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="943"/>
         <source>Right button sensitivity</source>
-        <translation type="unfinished"/>
+        <translation>右邊按鈕靈敏度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="943"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2241"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="957"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2255"/>
         <source>Graphical speed indicator</source>
-        <translation type="unfinished"/>
+        <translation>圖形化速度指示器</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="957"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2280"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="971"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2294"/>
         <source>Bottom gas consumption</source>
-        <translation type="unfinished"/>
+        <translation>置底氣體消耗</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="964"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2287"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="978"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2301"/>
         <source>Deco gas consumption</source>
-        <translation type="unfinished"/>
+        <translation>減壓氣體消耗</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1036"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2295"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1050"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2309"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1721"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1876"/>
         <source>Gas settings</source>
         <translation>氣體設定</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1084"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1169"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2343"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2428"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1098"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1183"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2357"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2442"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1647"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1670"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1814"/>
@@ -1119,10 +1119,10 @@
         <translation>%He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1089"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1174"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2348"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2433"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1103"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1188"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2447"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1649"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1672"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1816"/>
@@ -1131,12 +1131,12 @@
         <translation>類型</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1094"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1179"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1254"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2353"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2438"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2503"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1108"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1193"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2367"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2452"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2517"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1651"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1674"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1818"/>
@@ -1145,80 +1145,80 @@
         <translation>變更深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1099"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1113"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2372"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1656"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1823"/>
         <source>Gas 1</source>
         <translation>Gas 1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1104"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2363"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1118"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2377"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1658"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1825"/>
         <source>Gas 2</source>
         <translation>Gas 2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1109"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2368"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1123"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2382"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1660"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1827"/>
         <source>Gas 3</source>
         <translation>Gas 3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1114"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2373"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1128"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2387"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1662"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1829"/>
         <source>Gas 4</source>
         <translation>Gas 4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1119"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2378"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2392"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1664"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1831"/>
         <source>Gas 5</source>
         <translation>Gas 5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1184"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2443"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1198"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2457"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1679"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1846"/>
         <source>Dil 1</source>
         <translation>Dil 1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1189"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2448"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1203"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2462"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1681"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1848"/>
         <source>Dil 2</source>
         <translation>Dil 2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1194"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2453"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1208"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1683"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1850"/>
         <source>Dil 3</source>
         <translation>Dil 3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1199"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2458"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1213"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2472"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1685"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1852"/>
         <source>Dil 4</source>
         <translation>Dil 4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1204"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2463"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1218"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2477"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1687"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1854"/>
         <source>Dil 5</source>
@@ -1234,67 +1234,67 @@
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
         <source>Change depth [m]</source>
-        <translation>Change depth [m]</translation>
+        <translation>變更深度 [m]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1259"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2508"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1273"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2522"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1698"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1865"/>
         <source>SP 1</source>
         <translation>SP 1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2513"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1278"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2527"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1700"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1867"/>
         <source>SP 2</source>
         <translation>SP 2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1269"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2518"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1283"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2532"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1702"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1869"/>
         <source>SP 3</source>
         <translation>SP 3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1274"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1288"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1704"/>
         <source>SP 4</source>
         <translation>SP 4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1279"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1293"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1706"/>
         <source>SP 5</source>
         <translation>SP 5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1311"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
         <translation>Fixed setpoint</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1316"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1330"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1714"/>
         <source>Sensor</source>
         <translation>感測器</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1324"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1338"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1716"/>
         <source>Setpoint fallback</source>
         <translation>Setpoint fallback</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1347"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1363"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2539"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2555"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1361"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1377"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2553"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2569"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1717"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1718"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1872"/>
@@ -1303,39 +1303,39 @@
         <translation> cbar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1592"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1606"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
         <source>P1 (medium)</source>
         <extracomment>Suunto safety level</extracomment>
         <translation>P1 (普通)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1597"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1611"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
         <source>P2 (high)</source>
         <extracomment>Suunto safety level</extracomment>
         <translation>P2 (高)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1636"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1650"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
         <source>Total dive time</source>
         <translation>總潛水時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1860"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1874"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
         <source>kg/ℓ</source>
         <translation>kg/ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2074"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2088"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
         <source>Apnoea</source>
         <translation>Apnoea</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1427"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1441"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
         <source>Safety level</source>
         <translation>安全等級</translation>
@@ -1343,7 +1343,7 @@
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
         <source>Connect</source>
-        <translation type="unfinished"/>
+        <translation>連接</translation>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="64"/>
@@ -1353,31 +1353,31 @@
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
         <source>OSTC 3,Sport,Cr,2</source>
-        <translation type="unfinished"/>
+        <translation>OSTC 3,Sport,Cr,2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="936"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="950"/>
         <source>MOD warning</source>
-        <translation type="unfinished"/>
+        <translation>MOD 警示</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="950"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="964"/>
         <source>Dynamic ascent rate</source>
-        <translation type="unfinished"/>
+        <translation>動態上升速率</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1003"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2264"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1017"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1033"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2262"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2278"/>
         <source> ℓ/min</source>
-        <translation type="unfinished"/>
+        <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1079"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1164"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2338"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2423"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1093"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1178"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2352"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2437"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
@@ -1386,283 +1386,284 @@
         <translation>%O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1249"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2498"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1263"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2512"/>
         <source>Setpoint</source>
         <translation>Setpoint</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1287"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1301"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
         <source>O₂ in calibration gas</source>
         <translation>校正氣體的O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1379"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2571"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1393"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2585"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1874"/>
         <source>pO₂ max</source>
         <translation>pO₂ max</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1386"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2578"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1400"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2592"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1720"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1875"/>
         <source>pO₂ min</source>
         <translation>pO₂ min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1453"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
         <translation>海拔範圍</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1460"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1474"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1724"/>
         <source>Model</source>
         <translation>型號</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1922"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1494"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1936"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1725"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1778"/>
         <source>Number of dives</source>
         <translation>潛水編號</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1540"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1554"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1728"/>
         <source>Max depth</source>
         <translation>最大深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1587"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1601"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1732"/>
         <source>P0 (none)</source>
         <extracomment>Suunto safety level</extracomment>
         <translation>P0 (無)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1605"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1619"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
         <translation>取樣頻率</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1618"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1632"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1740"/>
         <source>20s</source>
         <translation>20s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1623"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1637"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1741"/>
         <source>30s</source>
         <translation>30s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1628"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1642"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1742"/>
         <source>60s</source>
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1643"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="541"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1657"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
         <source>Computer model</source>
         <translation>電腦模型</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1660"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1752"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1674"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1766"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1746"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1762"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1674"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1688"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1749"/>
         <source>24h</source>
         <translation>24h</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1693"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1750"/>
         <source>12h</source>
         <translation>12h</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1687"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1701"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1752"/>
         <source>Time format</source>
         <translation>時間格式</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1702"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1716"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1756"/>
         <source>Imperial</source>
         <translation>英制</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1707"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1721"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1757"/>
         <source>Metric</source>
         <translation>公制</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1718"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1732"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1759"/>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1725"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1739"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1760"/>
         <source>Light</source>
         <translation>Light</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1742"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1756"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1761"/>
         <source>Depth alarm</source>
         <translation>深度警示</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1762"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1776"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1763"/>
         <source>Time alarm</source>
         <translation>時間警示</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1787"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1801"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
         <source>Salinity</source>
         <translation>鹽度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1904"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1918"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
         <translation>MM/DD/YY</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1909"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1923"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1775"/>
         <source>DD/MM/YY</source>
         <translation>DD/MM/YY</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1914"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1928"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1776"/>
         <source>YY/MM/DD</source>
         <translation>YY/MM/DD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2069"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2083"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2079"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2093"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
         <translation>L16-GF OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2084"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2098"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1797"/>
         <source>L16-GF CC</source>
         <translation>L16-GF CC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2089"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2103"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1798"/>
         <source>PSCR-GF</source>
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1077"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1098"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1081"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1102"/>
         <source>Backup files (*.xml)</source>
         <translation>備份檔案 (*.xml)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1082"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1086"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>儲存備份檔案時發生錯誤。
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1085"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1089"/>
         <source>Backup succeeded</source>
         <translation>備份成功</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1086"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1090"/>
         <source>Your settings have been saved to: %1</source>
         <translation>設定會儲存至：%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1076"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1080"/>
         <source>Backup dive computer settings</source>
         <translation>備份潛水電腦設定</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1081"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1085"/>
         <source>XML backup error</source>
         <translation>XML備份錯誤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1097"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1101"/>
         <source>Restore dive computer settings</source>
         <translation>還原潛水電腦設定</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1101"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1107"/>
         <source>XML restore error</source>
         <translation>XML還原錯誤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1102"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1108"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>還原備份檔案時發生錯誤。
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1106"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1112"/>
         <source>Restore succeeded</source>
         <translation>還原成功</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1107"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1113"/>
         <source>Your settings have been restored successfully.</source>
         <translation>設定被還原成功．</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1123"/>
         <source>Select firmware file</source>
         <translation>選擇韌體檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1118"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1124"/>
         <source>All files (*.*)</source>
         <translation>所有檔案 (*.*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1174"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1180"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>選擇記錄檔供潛水電腦下載日誌檔</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1175"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1181"/>
         <source>Log files (*.log)</source>
         <translation>記錄檔 (*.log)</translation>
     </message>
@@ -1778,7 +1779,7 @@
         <location filename="../qt-ui/divecomponentselection.ui" line="73"/>
         <location filename="../build/ui_divecomponentselection.h" line="141"/>
         <source>Dive site</source>
-        <translation type="unfinished"/>
+        <translation>潛點</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomponentselection.ui" line="94"/>
@@ -1854,7 +1855,7 @@
     <message>
         <location filename="../qt-ui/profile/diveeventitem.cpp" line="116"/>
         <source>Manual switch to OC</source>
-        <translation type="unfinished"/>
+        <translation>手動切換至 OC</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
@@ -1872,27 +1873,27 @@
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="652"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="644"/>
         <source>Date/time</source>
         <translation>日期/時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="654"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="646"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="656"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="648"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="678"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="670"/>
         <source>h:</source>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="678"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="670"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -1998,97 +1999,115 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="837"/>
+        <location filename="../qt-ui/divelistview.cpp" line="845"/>
         <source>Expand all</source>
         <translation>全部展開</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="839"/>
+        <location filename="../qt-ui/divelistview.cpp" line="847"/>
         <source>Collapse all</source>
         <translation>全部摺疊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
+        <location filename="../qt-ui/divelistview.cpp" line="851"/>
         <source>Collapse others</source>
         <translation>摺疊其它</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="847"/>
+        <location filename="../qt-ui/divelistview.cpp" line="855"/>
         <source>Remove dive(s) from trip</source>
         <translation>從旅程中移除潛水記錄(多支)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="848"/>
+        <location filename="../qt-ui/divelistview.cpp" line="856"/>
         <source>Create new trip above</source>
         <translation>設定為新的旅程</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="862"/>
+        <location filename="../qt-ui/divelistview.cpp" line="870"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>於上方增加潛水記錄(多支)至旅程中</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="864"/>
+        <location filename="../qt-ui/divelistview.cpp" line="872"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>於下方增加潛水記錄(多支)至旅程中</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="868"/>
+        <location filename="../qt-ui/divelistview.cpp" line="876"/>
         <source>Merge trip with trip above</source>
         <translation>與上方旅程合併</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="869"/>
+        <location filename="../qt-ui/divelistview.cpp" line="877"/>
         <source>Merge trip with trip below</source>
         <translation>與下方旅程合併</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="873"/>
+        <location filename="../qt-ui/divelistview.cpp" line="881"/>
         <source>Delete dive(s)</source>
         <translation>刪除潛水記錄(多支)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="875"/>
+        <location filename="../qt-ui/divelistview.cpp" line="883"/>
         <source>Mark dive(s) invalid</source>
         <translation>標示為無效的潛水記錄(多支)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="879"/>
+        <location filename="../qt-ui/divelistview.cpp" line="887"/>
         <source>Merge selected dives</source>
         <translation>合併所選擇的潛水記錄</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="881"/>
+        <location filename="../qt-ui/divelistview.cpp" line="889"/>
         <source>Renumber dive(s)</source>
         <translation>為潛水記錄(多支)重新編號</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="882"/>
+        <location filename="../qt-ui/divelistview.cpp" line="890"/>
         <source>Shift dive times</source>
-        <translation type="unfinished"/>
+        <translation>移動潛水時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="883"/>
+        <location filename="../qt-ui/divelistview.cpp" line="891"/>
+        <source>Split selected dives</source>
+        <translation>分開所選擇的潛水</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="892"/>
         <source>Load image(s) from file(s)</source>
-        <translation type="unfinished"/>
+        <translation>從檔案(s)載入圖片(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="884"/>
+        <location filename="../qt-ui/divelistview.cpp" line="893"/>
         <source>Load image(s) from web</source>
-        <translation type="unfinished"/>
+        <translation>從網路載入圖片(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="907"/>
+        <location filename="../qt-ui/divelistview.cpp" line="916"/>
         <source>Open image files</source>
         <translation>開啟影像檔</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="907"/>
+        <location filename="../qt-ui/divelistview.cpp" line="916"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>影像檔案 (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
 </context>
 <context>
+    <name>DiveLocationModel</name>
+    <message>
+        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <source>Create a new dive site, copying relevant information from the current dive.</source>
+        <translation>建立新的潛點, 從潛水紀錄複製相關資訊. </translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <source>Create a new dive site with this name</source>
+        <translation>以此名稱建立新的潛點</translation>
+    </message>
+</context>
+<context>
     <name>DiveLogExportDialog</name>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="103"/>
@@ -2112,7 +2131,7 @@
         <location filename="../qt-ui/divelogexportdialog.ui" line="197"/>
         <location filename="../build/ui_divelogexportdialog.h" line="359"/>
         <source>I&amp;mage depths</source>
-        <translation type="unfinished"/>
+        <translation>照片深度</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="243"/>
@@ -2156,13 +2175,13 @@
         <location filename="../qt-ui/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface &amp;XML</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
-        <translation type="unfinished"/>
+        <translation>di&amp;velogs.de</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="157"/>
@@ -2222,7 +2241,7 @@
         <location filename="../qt-ui/divelogexportdialog.ui" line="375"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
-        <translation type="unfinished"/>
+        <translation>所有潛水</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="385"/>
@@ -2234,7 +2253,7 @@
         <location filename="../qt-ui/divelogexportdialog.ui" line="392"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
-        <translation type="unfinished"/>
+        <translation>匯出照片</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="408"/>
@@ -2411,7 +2430,7 @@
     <message>
         <location filename="../qt-ui/divelogexportdialog.cpp" line="199"/>
         <source>Please wait, exporting...</source>
-        <translation type="unfinished"/>
+        <translation>請稍待, 匯出中...</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.cpp" line="234"/>
@@ -2571,90 +2590,90 @@
         <location filename="../qt-ui/divelogimportdialog.cpp" line="713"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="772"/>
         <source>Sample time</source>
-        <translation>樣本時間</translation>
+        <translation>取樣時間</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="664"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="715"/>
         <source>Sample depth</source>
-        <translation>樣本深度</translation>
+        <translation>取樣深度</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="666"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="717"/>
         <source>Sample temperature</source>
-        <translation>樣本溫度</translation>
+        <translation>取樣溫度</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="670"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="721"/>
         <source>Sample sensor1 pO₂</source>
-        <translation type="unfinished"/>
+        <translation>取樣感測器 1 pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="569"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="672"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="723"/>
         <source>Sample sensor2 pO₂</source>
-        <translation type="unfinished"/>
+        <translation>取樣感測器 2 pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="571"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="674"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="725"/>
         <source>Sample sensor3 pO₂</source>
-        <translation type="unfinished"/>
+        <translation>取樣感測器 3 pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="682"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="733"/>
         <source>Sample stopdepth</source>
-        <translation>樣本停留深度</translation>
+        <translation>取樣停留深度</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="686"/>
         <source>Sample setpoint</source>
-        <translation type="unfinished"/>
+        <translation>取樣設定點</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="668"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="719"/>
         <source>Sample pO₂</source>
-        <translation>樣本pO₂</translation>
+        <translation>取樣 pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="573"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="676"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="727"/>
         <source>Sample CNS</source>
-        <translation>樣本CNS</translation>
+        <translation>取樣 CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="575"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="678"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="729"/>
         <source>Sample NDL</source>
-        <translation>樣本NDL</translation>
+        <translation>取樣 NDL</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="680"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="731"/>
         <source>Sample TTS</source>
-        <translation>樣本TTS</translation>
+        <translation>取樣 TTS</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="684"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="735"/>
         <source>Sample pressure</source>
-        <translation>樣本壓力</translation>
+        <translation>取樣壓力</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
@@ -2796,7 +2815,7 @@
     <message>
         <location filename="../qt-models/diveplannermodel.cpp" line="309"/>
         <source>CC setpoint</source>
-        <translation type="unfinished"/>
+        <translation>CC 設定點</translation>
     </message>
 </context>
 <context>
@@ -2993,7 +3012,11 @@
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Oxygen-Sans'; font-size:7pt; font-weight:600; font-style:normal;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Oxygen-Sans&apos;; font-size:7pt; font-weight:600; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
 <context>
@@ -3127,96 +3150,97 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="152"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="163"/>
         <source>no dives were selected</source>
         <translation>未選取任何潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="182"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>建立 zip 壓縮檔上傳失敗: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="224"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="235"/>
         <source>internal error</source>
         <translation>內部錯誤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="711"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="901"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="722"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="912"/>
         <source>Done</source>
         <translation>完成</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="744"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
         <source>Uploading dive list...</source>
         <translation>上傳潛水列表...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="776"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
         <source>Downloading dive list...</source>
         <translation>下載潛水列表...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Downloading %1 dives...</source>
         <translation>下載 %1 潛水...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Download finished - %1</source>
         <translation>下載結束 - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
         <source>Problem with download</source>
-        <translation type="unfinished"/>
+        <translation>下載發生錯誤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="877"/>
         <source>The archive could not be opened:
 </source>
-        <translation type="unfinished"/>
+        <translation>存檔無法被開啟: 
+</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="875"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="886"/>
         <source>Corrupted download</source>
         <translation>中斷下載</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="887"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>此存檔無法被開啟:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="915"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="926"/>
         <source>Upload failed</source>
         <translation>上傳失敗</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="918"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="929"/>
         <source>Upload successful</source>
         <translation>上傳成功</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="921"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="932"/>
         <source>Login failed</source>
         <translation>登入失敗</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="924"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="935"/>
         <source>Cannot parse response</source>
         <translation>回覆無法解析</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="946"/>
         <source>Error: %1</source>
         <translation>錯誤: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="902"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="913"/>
         <source>Upload finished</source>
         <translation>上傳結束</translation>
     </message>
@@ -3229,7 +3253,7 @@ p, li { white-space: pre-wrap; }
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="444"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="436"/>
         <source>Retry</source>
         <translation>重試</translation>
     </message>
@@ -3246,35 +3270,35 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="104"/>
         <source>Choose Bluetooth download mode</source>
-        <translation type="unfinished"/>
+        <translation>選擇藍芽下載模式</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="390"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="382"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>選擇記錄檔供潛水電腦下載日誌檔</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="391"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="383"/>
         <source>Log files (*.log)</source>
         <translation>記錄檔 (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="406"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="398"/>
         <source>Warning</source>
         <translation>提醒</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="407"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="399"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>儲存潛水電腦傾印資訊並不會下載潛水記錄</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="418"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="410"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>選擇檔案供潛水電腦記錄傾印資訊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="419"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="411"/>
         <source>Dump files (*.bin)</source>
         <translation>傾印檔 (*bin)</translation>
     </message>
@@ -3302,7 +3326,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="122"/>
         <source>Choose Bluetooth download mode</source>
-        <translation type="unfinished"/>
+        <translation>選擇藍芽下載模式</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="149"/>
@@ -3336,7 +3360,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
-        <translation type="unfinished"/>
+        <translation>選擇遠端藍芽裝置. </translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="179"/>
@@ -3478,12 +3502,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1683"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1733"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>此功能目前並不支援所選取的潛水電腦</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1688"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1738"/>
         <source>Firmware update failed!</source>
         <translation>韌體上傳失敗！</translation>
     </message>
@@ -3506,13 +3530,13 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="91"/>
         <source>Close message</source>
-        <translation type="unfinished"/>
+        <translation>關閉訊息</translation>
     </message>
 </context>
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="633"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
         <source>Location: </source>
         <translation>位置：</translation>
     </message>
@@ -3522,32 +3546,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-ui/modeldelegates.cpp" line="540"/>
         <source> (same GPS fix)</source>
-        <translation type="unfinished"/>
+        <translation> (同一 GPS 位置)</translation>
     </message>
     <message>
         <location filename="../qt-ui/modeldelegates.cpp" line="545"/>
         <source> (~%1 away</source>
-        <translation type="unfinished"/>
+        <translation> (~%1 離開</translation>
     </message>
-    <message numerus="yes">
+    <message>
         <location filename="../qt-ui/modeldelegates.cpp" line="546"/>
-        <source>, %n dive(s) here)</source>
-        <translation type="unfinished"><numerusform></numerusform></translation>
+        <source>, %1 dive(s) here)</source>
+        <translation>, %1 此處潛水(s))</translation>
     </message>
     <message>
         <location filename="../qt-ui/modeldelegates.cpp" line="551"/>
         <source>(no existing GPS data, add GPS fix from this dive)</source>
-        <translation type="unfinished"/>
+        <translation>(無存在的 GPS 資料, 從此次潛水增加 GPS 位置)</translation>
     </message>
     <message>
         <location filename="../qt-ui/modeldelegates.cpp" line="553"/>
         <source>(no GPS data)</source>
-        <translation type="unfinished"/>
+        <translation>(無 GPS 資料)</translation>
     </message>
     <message>
         <location filename="../qt-ui/modeldelegates.cpp" line="555"/>
         <source>Pick site: </source>
-        <translation type="unfinished"/>
+        <translation>選擇潛點: </translation>
     </message>
 </context>
 <context>
@@ -3592,18 +3616,28 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationInformation.ui" line="69"/>
+        <source>Reverse geo lookup</source>
+        <translation>反向座標位置搜尋</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationInformation.ui" line="72"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationInformation.ui" line="90"/>
+        <location filename="../qt-ui/locationInformation.ui" line="93"/>
         <source>Dive sites on same coordinates</source>
-        <translation type="unfinished"/>
+        <translation>相同位置的潛點</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationInformation.ui" line="131"/>
+        <source>Tags</source>
+        <translation>標籤</translation>
     </message>
     <message>
         <location filename="../build/ui_locationInformation.h" line="112"/>
         <source>Dive Site</source>
-        <translation type="unfinished"/>
+        <translation>潛點</translation>
     </message>
 </context>
 <context>
@@ -3611,125 +3645,126 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-models/divelocationmodel.cpp" line="67"/>
         <source>Create dive site with this name</source>
-        <translation type="unfinished"/>
+        <translation>以此名稱建立潛點</translation>
     </message>
 </context>
 <context>
     <name>LocationInformationWidget</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="22"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="25"/>
         <source>Apply changes</source>
         <translation>套用變更</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="25"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="28"/>
         <source>Discard changes</source>
         <translation>取消變更</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="28"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="207"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="31"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
         <source>Dive site management</source>
-        <translation type="unfinished"/>
+        <translation>潛點管理</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="60"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="63"/>
         <source>Merge into current site</source>
-        <translation type="unfinished"/>
+        <translation>合併至此潛點</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="68"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="72"/>
         <source>Merging dive sites</source>
-        <translation type="unfinished"/>
+        <translation>合併潛點</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="69"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="73"/>
         <source>You are about to merge dive sites, you can't undo that action 
  Are you sure you want to continue?</source>
-        <translation type="unfinished"/>
+        <translation>您正要進行合併潛點, 此動作無法被還原. 
+請注意是否要繼續? </translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="214"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
         <source>You are editing a dive site</source>
-        <translation type="unfinished"/>
+        <translation>您正在編輯潛點</translation>
     </message>
 </context>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
-        <location filename="../qt-ui/maintab.cpp" line="627"/>
+        <location filename="../qt-ui/maintab.cpp" line="567"/>
         <source>Location</source>
         <translation>位置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="231"/>
+        <location filename="../qt-ui/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
         <translation>潛導</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="241"/>
+        <location filename="../qt-ui/maintab.ui" line="262"/>
         <location filename="../build/ui_maintab.h" line="955"/>
         <source>Buddy</source>
         <translation>潛伴</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="366"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <location filename="../build/ui_maintab.h" line="959"/>
         <source>Tags</source>
         <translation>標籤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="287"/>
+        <location filename="../qt-ui/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
         <translation>評分</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="300"/>
+        <location filename="../qt-ui/maintab.ui" line="321"/>
         <location filename="../build/ui_maintab.h" line="957"/>
         <source>Visibility</source>
         <translation>能見度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="328"/>
         <location filename="../build/ui_maintab.h" line="958"/>
         <source>Suit</source>
         <translation>防寒衣</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="376"/>
+        <location filename="../qt-ui/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>潛水模式</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="94"/>
-        <location filename="../qt-ui/maintab.ui" line="761"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.ui" line="836"/>
         <location filename="../build/ui_maintab.h" line="949"/>
         <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../qt-ui/maintab.cpp" line="350"/>
+        <location filename="../qt-ui/maintab.cpp" line="309"/>
         <source>Air temp.</source>
         <translation>氣溫</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="104"/>
-        <location filename="../qt-ui/maintab.ui" line="780"/>
+        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="855"/>
         <location filename="../build/ui_maintab.h" line="950"/>
         <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../qt-ui/maintab.cpp" line="351"/>
+        <location filename="../qt-ui/maintab.cpp" line="310"/>
         <source>Water temp.</source>
         <translation>水溫</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="439"/>
         <location filename="../build/ui_maintab.h" line="961"/>
         <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../qt-ui/maintab.cpp" line="602"/>
-        <location filename="../qt-ui/maintab.cpp" line="628"/>
+        <location filename="../qt-ui/maintab.cpp" line="539"/>
+        <location filename="../qt-ui/maintab.cpp" line="568"/>
         <source>Notes</source>
         <translation>記錄</translation>
     </message>
@@ -3737,328 +3772,328 @@ p, li { white-space: pre-wrap; }
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../build/ui_maintab.h" line="964"/>
         <source>General notes about the current selection</source>
-        <translation type="unfinished"/>
+        <translation>現在選取的相關記錄</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="196"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
         <source>Edit dive site</source>
-        <translation type="unfinished"/>
+        <translation>編輯潛點</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../build/ui_maintab.h" line="953"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="461"/>
+        <location filename="../qt-ui/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
         <translation>裝備</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="464"/>
+        <location filename="../qt-ui/maintab.ui" line="494"/>
         <location filename="../build/ui_maintab.h" line="966"/>
         <source>Used equipment in the current selection</source>
-        <translation type="unfinished"/>
+        <translation>此次選擇所使用的裝備</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="529"/>
+        <location filename="../qt-ui/maintab.ui" line="586"/>
         <location filename="../build/ui_maintab.h" line="994"/>
         <source>Info</source>
         <translation>資訊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="589"/>
         <location filename="../build/ui_maintab.h" line="995"/>
         <source>Dive information</source>
         <translation>潛水資訊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="609"/>
+        <location filename="../qt-ui/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
         <translation>消耗氣體</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="628"/>
+        <location filename="../qt-ui/maintab.ui" line="703"/>
         <location filename="../build/ui_maintab.h" line="973"/>
         <source>Gas consumed</source>
         <translation>氣體消耗</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="666"/>
+        <location filename="../qt-ui/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>最大深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
         <translation>氣壓</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <location filename="../build/ui_maintab.h" line="991"/>
         <source>Dive time</source>
         <translation>潛水時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="858"/>
+        <location filename="../qt-ui/maintab.ui" line="933"/>
         <location filename="../build/ui_maintab.h" line="1007"/>
         <source>Simple statistics about the selection</source>
-        <translation type="unfinished"/>
+        <translation>有關所選取的摘要資訊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="946"/>
+        <location filename="../qt-ui/maintab.ui" line="1039"/>
         <location filename="../build/ui_maintab.h" line="999"/>
         <source>Total time</source>
         <translation>全部時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="1013"/>
+        <location filename="../qt-ui/maintab.ui" line="1106"/>
         <location filename="../build/ui_maintab.h" line="1004"/>
         <source>Gas consumption</source>
         <translation>氣體消耗</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="1058"/>
+        <location filename="../qt-ui/maintab.ui" line="1151"/>
         <location filename="../build/ui_maintab.h" line="1009"/>
         <source>All photos from the current selection</source>
-        <translation type="unfinished"/>
+        <translation>選擇的所有照片</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="1075"/>
+        <location filename="../qt-ui/maintab.ui" line="1177"/>
         <location filename="../build/ui_maintab.h" line="1010"/>
         <source>Extra data</source>
         <translation>其它資料</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="1078"/>
+        <location filename="../qt-ui/maintab.ui" line="1180"/>
         <location filename="../build/ui_maintab.h" line="1011"/>
         <source>Adittional data from the dive computer</source>
-        <translation type="unfinished"/>
+        <translation>潛水電腦中的附加資料</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="74"/>
-        <location filename="../qt-ui/maintab.ui" line="571"/>
+        <location filename="../qt-ui/maintab.ui" line="92"/>
+        <location filename="../qt-ui/maintab.ui" line="646"/>
         <location filename="../build/ui_maintab.h" line="947"/>
         <location filename="../build/ui_maintab.h" line="967"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="84"/>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
         <location filename="../build/ui_maintab.h" line="948"/>
         <source>Time</source>
         <translation>時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="590"/>
+        <location filename="../qt-ui/maintab.ui" line="665"/>
         <location filename="../build/ui_maintab.h" line="969"/>
         <source>Interval</source>
         <translation>水面休息時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="647"/>
-        <location filename="../qt-ui/maintab.ui" line="1001"/>
+        <location filename="../qt-ui/maintab.ui" line="722"/>
+        <location filename="../qt-ui/maintab.ui" line="1094"/>
         <location filename="../build/ui_maintab.h" line="975"/>
         <location filename="../build/ui_maintab.h" line="1003"/>
         <source>SAC</source>
         <translation>耗氣率</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="723"/>
+        <location filename="../qt-ui/maintab.ui" line="798"/>
         <location filename="../build/ui_maintab.h" line="983"/>
         <source>Avg. depth</source>
         <translation>平均深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="685"/>
+        <location filename="../qt-ui/maintab.ui" line="760"/>
         <location filename="../build/ui_maintab.h" line="979"/>
         <source>OTU</source>
         <translation>氧容許量 OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="818"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
         <translation>鹽度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="855"/>
+        <location filename="../qt-ui/maintab.ui" line="930"/>
         <location filename="../build/ui_maintab.h" line="1006"/>
         <source>Stats</source>
         <translation>統計</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="893"/>
+        <location filename="../qt-ui/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="934"/>
+        <location filename="../qt-ui/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="905"/>
+        <location filename="../qt-ui/maintab.ui" line="998"/>
         <location filename="../build/ui_maintab.h" line="997"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="965"/>
+        <location filename="../qt-ui/maintab.ui" line="1058"/>
         <location filename="../build/ui_maintab.h" line="1001"/>
         <source>Dives</source>
         <translation>潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="1055"/>
+        <location filename="../qt-ui/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>照片</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="103"/>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="107"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>配重</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="64"/>
         <source>Apply changes</source>
         <translation>套用變更</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="68"/>
         <source>Discard changes</source>
         <translation>取消變更</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="104"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add cylinder</source>
         <translation>新增氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="108"/>
+        <location filename="../qt-ui/maintab.cpp" line="94"/>
         <source>Add weight system</source>
         <translation>新增配重系統</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="347"/>
+        <location filename="../qt-ui/maintab.cpp" line="306"/>
         <source>Air temp. [%1]</source>
         <translation>氣溫 [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="348"/>
+        <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Water temp. [%1]</source>
         <translation>水溫 [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="385"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>This trip is being edited.</source>
         <translation>此旅程已被編輯.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="392"/>
+        <location filename="../qt-ui/maintab.cpp" line="353"/>
         <source>Multiple dives are being edited.</source>
         <translation>此些旅程已被編輯.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="394"/>
+        <location filename="../qt-ui/maintab.cpp" line="355"/>
         <source>This dive is being edited.</source>
         <translation>此潛水已被編輯.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="572"/>
-        <location filename="../qt-ui/maintab.cpp" line="597"/>
+        <location filename="../qt-ui/maintab.cpp" line="504"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <source>Trip notes</source>
         <translation>旅程筆記</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="529"/>
         <source>Trip location</source>
         <translation>旅程位置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="665"/>
-        <location filename="../qt-ui/maintab.cpp" line="697"/>
-        <location filename="../qt-ui/maintab.cpp" line="701"/>
-        <location filename="../qt-ui/maintab.cpp" line="705"/>
+        <location filename="../qt-ui/maintab.cpp" line="605"/>
+        <location filename="../qt-ui/maintab.cpp" line="637"/>
+        <location filename="../qt-ui/maintab.cpp" line="641"/>
+        <location filename="../qt-ui/maintab.cpp" line="645"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="694"/>
+        <location filename="../qt-ui/maintab.cpp" line="634"/>
         <source>Deepest dive</source>
         <translation>最深的潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="695"/>
+        <location filename="../qt-ui/maintab.cpp" line="635"/>
         <source>Shallowest dive</source>
         <translation>最淺的潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="708"/>
+        <location filename="../qt-ui/maintab.cpp" line="648"/>
         <source>Highest total SAC of a dive</source>
         <translation>潛水最高總SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="709"/>
+        <location filename="../qt-ui/maintab.cpp" line="649"/>
         <source>Lowest total SAC of a dive</source>
         <translation>潛水最低總SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="710"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>Average total SAC of all selected dives</source>
         <translation>所選擇的潛水，平均總SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="721"/>
+        <location filename="../qt-ui/maintab.cpp" line="661"/>
         <source>Highest temperature</source>
         <translation>最高溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="722"/>
+        <location filename="../qt-ui/maintab.cpp" line="662"/>
         <source>Lowest temperature</source>
         <translation>最低溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="723"/>
+        <location filename="../qt-ui/maintab.cpp" line="663"/>
         <source>Average temperature of all selected dives</source>
         <translation>所選取潛水的平均溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="733"/>
+        <location filename="../qt-ui/maintab.cpp" line="673"/>
         <source>Longest dive</source>
         <translation>最長潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="734"/>
+        <location filename="../qt-ui/maintab.cpp" line="674"/>
         <source>Shortest dive</source>
         <translation>最短潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="735"/>
+        <location filename="../qt-ui/maintab.cpp" line="675"/>
         <source>Average length of all selected dives</source>
         <translation>所選取潛水的平均時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="759"/>
+        <location filename="../qt-ui/maintab.cpp" line="699"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4067,17 +4102,22 @@ mixed from Air and using:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="763"/>
+        <location filename="../qt-ui/maintab.cpp" line="703"/>
         <source> and </source>
         <translation>與</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1217"/>
+        <location filename="../qt-ui/maintab.cpp" line="833"/>
+        <source>New dive site</source>
+        <translation>新的潛點</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="1127"/>
         <source>Discard the changes?</source>
         <translation>取消變更？</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1218"/>
+        <location filename="../qt-ui/maintab.cpp" line="1128"/>
         <source>You are about to discard your changes.</source>
         <translation>您將要放棄您的變更。</translation>
     </message>
@@ -4196,12 +4236,12 @@ mixed from Air and using:
         <location filename="../qt-ui/mainwindow.ui" line="137"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished"/>
+        <translation>編輯</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="142"/>
         <source>Share on</source>
-        <translation type="unfinished"/>
+        <translation>分享到</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="157"/>
@@ -4310,13 +4350,13 @@ mixed from Air and using:
         <location filename="../qt-ui/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
-        <translation type="unfinished"/>
+        <translation>編輯裝置名稱</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
-        <translation type="unfinished"/>
+        <translation>編輯潛水</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
@@ -4430,7 +4470,7 @@ mixed from Air and using:
         <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
-        <translation type="unfinished"/>
+        <translation>編輯潛水計畫</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="485"/>
@@ -4485,53 +4525,53 @@ mixed from Air and using:
         <location filename="../build/ui_mainwindow.h" line="560"/>
         <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Undo</source>
-        <translation type="unfinished"/>
+        <translation>復原</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Z</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
         <location filename="../qt-ui/mainwindow.cpp" line="227"/>
         <source>&amp;Redo</source>
-        <translation type="unfinished"/>
+        <translation>取消還原</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
-        <translation type="unfinished"/>
+        <translation>搜尋移動的照片</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
-        <translation type="unfinished"/>
+        <translation>開啟雲端裝置</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
-        <translation type="unfinished"/>
+        <translation>儲存至雲端裝置</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
-        <translation type="unfinished"/>
+        <translation>管理潛點</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
-        <translation type="unfinished"/>
+        <translation>潛點編輯</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="739"/>
@@ -4738,24 +4778,24 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="363"/>
         <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1814"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1851"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="464"/>
         <source>Traverse image directories</source>
-        <translation type="unfinished"/>
+        <translation>經過照片路徑</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="467"/>
         <source>Scan</source>
-        <translation type="unfinished"/>
+        <translation>掃描</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="475"/>
         <source>Scanning images...(this can take a while)</source>
-        <translation type="unfinished"/>
+        <translation>掃描影像...(需要稍待一段時間)</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="528"/>
@@ -4763,129 +4803,130 @@ mixed from Air and using:
         <translation>在關閉檔案前，請儲存或取消此次潛水的編輯。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>在新增潛水前，請先儲存或取消此次潛水的編輯。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="692"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
         <source>Print runtime table</source>
         <translation>列印操作表格</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="797"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
-        <translation type="unfinished"/>
+        <translation>嘗試編輯非手動建立的潛水記錄. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1055"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
-        <translation>您是否要對檔案 %1 所做的修改儲存？</translation>
+        <translation>您是否要對檔案 %1 所做的修改儲存? </translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1058"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
         <source>Do you want to save the changes that you made in the data file?</source>
-        <translation>您是否要對資料檔案所做的修改進行儲存？</translation>
+        <translation>您是否要對資料檔案所做的修改進行儲存? </translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
         <source>Save changes?</source>
-        <translation>儲存變更？</translation>
+        <translation>儲存變更? </translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1418"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1433"/>
         <source>Save file as</source>
         <translation>另存新檔</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1496"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1528"/>
         <source>[cloud storage for] %1</source>
-        <translation type="unfinished"/>
+        <translation>[雲端裝置] %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1593"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1628"/>
         <source>Opening datafile from older version</source>
-        <translation type="unfinished"/>
+        <translation>從較舊的版本中開啟資料檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1594"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1629"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
-        <translation type="unfinished"/>
+        <translation>自舊版的 Subsurface 開啟資料檔案. 建議請先在新版程式中, 閱讀相關變更, 特別是有關潛點管理的部分. 
+Subsurface 已嘗試預先填寫部分資料, 值得花些時間看看新的潛點管理系統, 並確認資料是否正確. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1605"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1640"/>
         <source>Open dive log file</source>
         <translation>打開潛水日誌檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1606"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1641"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1814"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1851"/>
         <source>Contacting cloud service...</source>
-        <translation type="unfinished"/>
+        <translation>聯絡雲端服務...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1064"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>如果不進行儲存，所做變更將會遺失。</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="720"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="791"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="797"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1651"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1686"/>
         <source>Warning</source>
         <translation>提醒</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1400"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1406"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>在開啟新檔前，請儲存或取消此次潛水的編輯。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="720"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation type="unfinished"/>
+        <translation>嘗試針對非原計畫的潛水進行重新規畫. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="844"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Yearly statistics</source>
         <translation>年統計</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1434"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="791"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1651"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1686"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>請在嘗試其他編輯時先完成當前編輯</translation>
     </message>
     <message>
         <location filename="../build/ui_mainwindow.h" line="565"/>
         <source>Open cloud storage</source>
-        <translation type="unfinished"/>
+        <translation>開啟雲端裝置</translation>
     </message>
     <message>
         <location filename="../build/ui_mainwindow.h" line="566"/>
         <source>Save to cloud storage</source>
-        <translation type="unfinished"/>
+        <translation>儲存至雲端裝置</translation>
     </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="718"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>過濾器顯示 %1 (of %2) 潛水</translation>
     </message>
@@ -4893,12 +4934,12 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="260"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="261"/>
         <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="../qt-ui/configuredivecomputerdialog.cpp" line="264"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -4907,27 +4948,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 請開啟 OSTC Sport 與 logbook 的藍芽功能，在更新之前，先下載日誌</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>Not now</source>
         <translation>非現在</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="267"/>
         <source>Update firmware</source>
         <translation>更新韌體</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
         <source>Firmware upgrade notice</source>
         <translation>韌體升級注意</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="286"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="287"/>
         <source>Save the downloaded firmware as</source>
         <translation>另存下載的韌體至</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="287"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="288"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX 檔案 (*.hex)</translation>
     </message>
@@ -5044,301 +5085,297 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <location filename="../qt-ui/preferences.ui" line="148"/>
         <location filename="../build/ui_preferences.h" line="1300"/>
         <source>Georeference</source>
-        <translation type="unfinished"/>
+        <translation>座標參考</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="190"/>
+        <location filename="../qt-ui/preferences.ui" line="195"/>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>字型</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="200"/>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
         <location filename="../build/ui_preferences.h" line="1305"/>
         <source>Font size</source>
         <translation>字體大小</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="213"/>
+        <location filename="../qt-ui/preferences.ui" line="218"/>
         <location filename="../build/ui_preferences.h" line="1306"/>
         <source>Dives</source>
         <translation>潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="242"/>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
-        <translation type="unfinished"/>
+        <translation>無預設檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="247"/>
+        <location filename="../qt-ui/preferences.ui" line="252"/>
         <location filename="../build/ui_preferences.h" line="1309"/>
         <source>&amp;Local default file</source>
-        <translation type="unfinished"/>
+        <translation>本地預設檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="262"/>
         <location filename="../build/ui_preferences.h" line="1310"/>
         <source>Clo&amp;ud storage default file</source>
-        <translation type="unfinished"/>
+        <translation>雲端裝置預設檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="274"/>
         <location filename="../build/ui_preferences.h" line="1311"/>
         <source>Local dive log file</source>
-        <translation type="unfinished"/>
+        <translation>本地端潛水日誌黨</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="281"/>
+        <location filename="../qt-ui/preferences.ui" line="286"/>
         <location filename="../build/ui_preferences.h" line="1312"/>
         <source>Use default</source>
         <translation>使用預設</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="291"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <location filename="../build/ui_preferences.h" line="1313"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="349"/>
+        <location filename="../qt-ui/preferences.ui" line="354"/>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>動畫演示</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <location filename="../build/ui_preferences.h" line="1319"/>
         <source>Speed</source>
         <translation>速度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <location filename="../build/ui_preferences.h" line="1320"/>
         <source>Clear all settings</source>
         <translation>清除所有設定</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="397"/>
+        <location filename="../qt-ui/preferences.ui" line="402"/>
         <location filename="../build/ui_preferences.h" line="1321"/>
         <source>Reset all settings to their default value</source>
         <translation>使用預設值重置所有設定</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="441"/>
         <location filename="../build/ui_preferences.h" line="1322"/>
         <source>Unit system</source>
-        <translation type="unfinished"/>
+        <translation>單位系統</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="442"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <location filename="../build/ui_preferences.h" line="1323"/>
         <source>System</source>
         <translation>系統</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1395"/>
+        <location filename="../qt-ui/preferences.ui" line="1408"/>
         <source>Connect to facebook text placeholder</source>
-        <translation type="unfinished"/>
+        <translation>與 facebook 地圖位置連結</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1407"/>
+        <location filename="../qt-ui/preferences.ui" line="1420"/>
         <source>Disconnect</source>
         <translation>中斷</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1433"/>
         <location filename="../build/ui_preferences.h" line="1401"/>
         <source>Dive site geo lookup</source>
-        <translation type="unfinished"/>
+        <translation>潛點座標搜尋</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1439"/>
         <location filename="../build/ui_preferences.h" line="1402"/>
         <source>Enable geocoding for dive site management</source>
-        <translation type="unfinished"/>
+        <translation>潛點系統管理啟用座標化</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1446"/>
         <location filename="../build/ui_preferences.h" line="1403"/>
         <source>Parse site without GPS data</source>
-        <translation type="unfinished"/>
+        <translation>解析無 GPS 資料潛點</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1453"/>
         <location filename="../build/ui_preferences.h" line="1404"/>
         <source>Same format for existing dives</source>
-        <translation type="unfinished"/>
+        <translation>現存潛水記錄使用相同格式</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1463"/>
+        <location filename="../qt-ui/preferences.ui" line="1446"/>
         <location filename="../build/ui_preferences.h" line="1405"/>
         <source>Dive Site Layout</source>
-        <translation type="unfinished"/>
+        <translation>潛點資訊配置</translation>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="1468"/>
         <location filename="../qt-ui/preferences.ui" line="1485"/>
-        <location filename="../qt-ui/preferences.ui" line="1502"/>
         <location filename="../build/ui_preferences.h" line="1406"/>
         <location filename="../build/ui_preferences.h" line="1407"/>
         <source>/</source>
-        <translation type="unfinished"/>
+        <translation>/</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="459"/>
+        <location filename="../qt-ui/preferences.ui" line="464"/>
         <location filename="../build/ui_preferences.h" line="1325"/>
         <source>Imperial</source>
         <translation>英制</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="494"/>
+        <location filename="../qt-ui/preferences.ui" line="499"/>
         <location filename="../build/ui_preferences.h" line="1328"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="501"/>
+        <location filename="../qt-ui/preferences.ui" line="506"/>
         <location filename="../build/ui_preferences.h" line="1329"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="511"/>
+        <location filename="../qt-ui/preferences.ui" line="516"/>
         <location filename="../build/ui_preferences.h" line="1330"/>
         <source>feet</source>
         <translation>feet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="528"/>
-        <location filename="../qt-ui/preferences.ui" line="946"/>
+        <location filename="../qt-ui/preferences.ui" line="533"/>
+        <location filename="../qt-ui/preferences.ui" line="951"/>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="538"/>
+        <location filename="../qt-ui/preferences.ui" line="543"/>
         <location filename="../build/ui_preferences.h" line="1333"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="570"/>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>攝氏</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="592"/>
+        <location filename="../qt-ui/preferences.ui" line="597"/>
         <location filename="../build/ui_preferences.h" line="1339"/>
         <source>fahrenheit</source>
         <translation>華氏</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="609"/>
+        <location filename="../qt-ui/preferences.ui" line="614"/>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <location filename="../qt-ui/preferences.ui" line="930"/>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR: 當查看pO₂時顯示setpoints</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="932"/>
+        <location filename="../qt-ui/preferences.ui" line="937"/>
         <location filename="../build/ui_preferences.h" line="1364"/>
         <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
         <translation>CCR: 當查看 pO₂ 時，個別顯示 O₂ 感測器數值</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="939"/>
+        <location filename="../qt-ui/preferences.ui" line="944"/>
         <location filename="../build/ui_preferences.h" line="1365"/>
         <source>Default CCR set-point for dive planning</source>
         <translation>計畫潛水使用預設 CCR set-point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="962"/>
+        <location filename="../qt-ui/preferences.ui" line="967"/>
         <location filename="../build/ui_preferences.h" line="1367"/>
         <source>pSCR O₂ metabolism rate</source>
         <translation>pSCR O₂ 代謝速率</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="969"/>
+        <location filename="../qt-ui/preferences.ui" line="974"/>
         <location filename="../build/ui_preferences.h" line="1368"/>
         <source>pSCR ratio</source>
         <translation>pSCR 比例</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="976"/>
+        <location filename="../qt-ui/preferences.ui" line="981"/>
         <location filename="../build/ui_preferences.h" line="1369"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="989"/>
+        <location filename="../qt-ui/preferences.ui" line="994"/>
         <location filename="../build/ui_preferences.h" line="1371"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1037"/>
+        <location filename="../qt-ui/preferences.ui" line="1042"/>
         <location filename="../build/ui_preferences.h" line="1372"/>
         <source>UI language</source>
-        <translation type="unfinished"/>
+        <translation>介面語言</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1043"/>
+        <location filename="../qt-ui/preferences.ui" line="1048"/>
         <location filename="../build/ui_preferences.h" line="1373"/>
         <source>System default</source>
         <translation>系統預設</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1115"/>
+        <location filename="../qt-ui/preferences.ui" line="1120"/>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1154"/>
+        <location filename="../qt-ui/preferences.ui" line="1159"/>
         <location filename="../build/ui_preferences.h" line="1379"/>
         <source>Proxy type</source>
         <translation>Proxy 種類</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1137"/>
+        <location filename="../qt-ui/preferences.ui" line="1142"/>
         <location filename="../build/ui_preferences.h" line="1377"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1127"/>
+        <location filename="../qt-ui/preferences.ui" line="1132"/>
         <location filename="../build/ui_preferences.h" line="1376"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1147"/>
+        <location filename="../qt-ui/preferences.ui" line="1152"/>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>需要認證</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1164"/>
+        <location filename="../qt-ui/preferences.ui" line="1169"/>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>使用者名稱</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1213"/>
-        <location filename="../qt-ui/preferences.ui" line="1267"/>
+        <location filename="../qt-ui/preferences.ui" line="1218"/>
+        <location filename="../qt-ui/preferences.ui" line="1272"/>
         <location filename="../build/ui_preferences.h" line="1381"/>
         <location filename="../build/ui_preferences.h" line="1387"/>
         <source>Password</source>
@@ -5350,157 +5387,157 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>與Facebook中斷連線</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1063"/>
+        <location filename="../qt-ui/preferences.ui" line="1068"/>
         <location filename="../build/ui_preferences.h" line="1374"/>
         <source>Filter</source>
         <translation>篩選器</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="521"/>
+        <location filename="../qt-ui/preferences.ui" line="526"/>
         <location filename="../build/ui_preferences.h" line="1331"/>
         <source>Pressure</source>
         <translation>壓力</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="181"/>
+        <location filename="../qt-ui/preferences.ui" line="186"/>
         <location filename="../build/ui_preferences.h" line="1303"/>
         <source>Lists and tables</source>
         <translation>列表與表單</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="228"/>
+        <location filename="../qt-ui/preferences.ui" line="233"/>
         <location filename="../build/ui_preferences.h" line="1307"/>
         <source>Default dive log file</source>
         <translation>預設潛水日誌檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="300"/>
+        <location filename="../qt-ui/preferences.ui" line="305"/>
         <location filename="../build/ui_preferences.h" line="1314"/>
         <source>Display invalid</source>
         <translation>顯示無效</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="317"/>
+        <location filename="../qt-ui/preferences.ui" line="322"/>
         <location filename="../build/ui_preferences.h" line="1316"/>
         <source>Default cylinder</source>
         <translation>預設氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="332"/>
+        <location filename="../qt-ui/preferences.ui" line="337"/>
         <location filename="../build/ui_preferences.h" line="1317"/>
         <source>Use default cylinder</source>
         <translation>使用的預設氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1251"/>
+        <location filename="../qt-ui/preferences.ui" line="1256"/>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <location filename="../qt-ui/preferences.cpp" line="123"/>
         <source>Subsurface cloud storage</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface 雲端裝置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1260"/>
+        <location filename="../qt-ui/preferences.ui" line="1265"/>
         <location filename="../build/ui_preferences.h" line="1386"/>
         <source>Email address</source>
         <translation>電子郵件地址</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1274"/>
+        <location filename="../qt-ui/preferences.ui" line="1279"/>
         <location filename="../build/ui_preferences.h" line="1388"/>
         <source>Verification PIN</source>
-        <translation type="unfinished"/>
+        <translation>驗證 PIN 碼</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1281"/>
+        <location filename="../qt-ui/preferences.ui" line="1286"/>
         <source>New password</source>
-        <translation type="unfinished"/>
+        <translation>新密碼</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1308"/>
+        <location filename="../qt-ui/preferences.ui" line="1321"/>
         <location filename="../build/ui_preferences.h" line="1395"/>
         <source>Sync to cloud in the background?</source>
-        <translation type="unfinished"/>
+        <translation>在背景與雲端同步? </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1315"/>
+        <location filename="../qt-ui/preferences.ui" line="1328"/>
         <location filename="../build/ui_preferences.h" line="1396"/>
         <source>Save Password locally?</source>
-        <translation type="unfinished"/>
+        <translation>於本地端儲存密碼? </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1325"/>
+        <location filename="../qt-ui/preferences.ui" line="1338"/>
         <location filename="../build/ui_preferences.h" line="1397"/>
         <source>Subsurface web service</source>
         <translation>Subsurface 網路服務</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1337"/>
+        <location filename="../qt-ui/preferences.ui" line="1350"/>
         <location filename="../build/ui_preferences.h" line="1398"/>
         <source>Default user ID</source>
         <translation>預設的使用者 ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1347"/>
+        <location filename="../qt-ui/preferences.ui" line="1360"/>
         <location filename="../build/ui_preferences.h" line="1399"/>
         <source>Save user ID locally?</source>
         <translation>是否儲存使用者 ID 於本機？</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <location filename="../build/ui_preferences.h" line="1334"/>
         <source>Volume</source>
         <translation>容量</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="575"/>
+        <location filename="../qt-ui/preferences.ui" line="580"/>
         <location filename="../build/ui_preferences.h" line="1337"/>
         <source>Temperature</source>
         <translation>溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="602"/>
+        <location filename="../qt-ui/preferences.ui" line="607"/>
         <location filename="../build/ui_preferences.h" line="1340"/>
         <source>Weight</source>
         <translation>重量</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="619"/>
+        <location filename="../qt-ui/preferences.ui" line="624"/>
         <location filename="../build/ui_preferences.h" line="1342"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="639"/>
         <location filename="../build/ui_preferences.h" line="1343"/>
         <source>Time units</source>
         <translation>時間單位</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="647"/>
+        <location filename="../qt-ui/preferences.ui" line="652"/>
         <location filename="../build/ui_preferences.h" line="1345"/>
         <source>Minutes</source>
         <translation>分</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="662"/>
         <location filename="../build/ui_preferences.h" line="1346"/>
         <source>Seconds</source>
         <translation>秒</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="737"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <location filename="../build/ui_preferences.h" line="1351"/>
         <source>Show</source>
         <translation>顯示</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="918"/>
+        <location filename="../qt-ui/preferences.ui" line="923"/>
         <location filename="../build/ui_preferences.h" line="1362"/>
         <source>GFLow at max depth</source>
         <translation>最大深度的 GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="878"/>
+        <location filename="../qt-ui/preferences.ui" line="883"/>
         <location filename="../build/ui_preferences.h" line="1359"/>
         <source>Misc</source>
         <translation>其它</translation>
@@ -5512,109 +5549,109 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>環境設定</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="449"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <location filename="../build/ui_preferences.h" line="1324"/>
         <source>&amp;Metric</source>
-        <translation type="unfinished"/>
+        <translation>公制</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="469"/>
+        <location filename="../qt-ui/preferences.ui" line="474"/>
         <location filename="../build/ui_preferences.h" line="1326"/>
         <source>Personali&amp;ze</source>
-        <translation type="unfinished"/>
+        <translation>個人化</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <location filename="../build/ui_preferences.h" line="1327"/>
         <source>Individual settings</source>
-        <translation type="unfinished"/>
+        <translation>個別設定</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="560"/>
         <location filename="../build/ui_preferences.h" line="1335"/>
         <source>&amp;liter</source>
-        <translation type="unfinished"/>
+        <translation>&amp;liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="640"/>
+        <location filename="../qt-ui/preferences.ui" line="645"/>
         <location filename="../build/ui_preferences.h" line="1344"/>
         <source>Ascent/descent speed denominator</source>
         <translation>上升／下降速度分母</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="672"/>
+        <location filename="../qt-ui/preferences.ui" line="677"/>
         <location filename="../build/ui_preferences.h" line="1347"/>
         <source>GPS coordinates</source>
         <translation>GPS座標</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="678"/>
+        <location filename="../qt-ui/preferences.ui" line="683"/>
         <location filename="../build/ui_preferences.h" line="1348"/>
         <source>Location Display</source>
-        <translation type="unfinished"/>
+        <translation>位置顯示</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="685"/>
+        <location filename="../qt-ui/preferences.ui" line="690"/>
         <location filename="../build/ui_preferences.h" line="1349"/>
         <source>traditional (dms)</source>
-        <translation type="unfinished"/>
+        <translation>傳統的 (dms)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="695"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <location filename="../build/ui_preferences.h" line="1350"/>
         <source>decimal</source>
-        <translation type="unfinished"/>
+        <translation>十進治</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
+        <location filename="../qt-ui/preferences.ui" line="753"/>
         <location filename="../build/ui_preferences.h" line="1352"/>
         <source>Threshold when showing pO₂</source>
         <translation>顯示 pO₂ 時的臨界值</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="772"/>
+        <location filename="../qt-ui/preferences.ui" line="777"/>
         <location filename="../build/ui_preferences.h" line="1353"/>
         <source>Threshold when showing pN₂</source>
         <translation>顯示 pN₂ 時的臨界值</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="796"/>
+        <location filename="../qt-ui/preferences.ui" line="801"/>
         <location filename="../build/ui_preferences.h" line="1354"/>
         <source>Threshold when showing pHe</source>
         <translation>顯示 pHe 時的臨界值</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="820"/>
+        <location filename="../qt-ui/preferences.ui" line="825"/>
         <location filename="../build/ui_preferences.h" line="1355"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>顯示 MOD 時最大的 pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="844"/>
+        <location filename="../qt-ui/preferences.ui" line="849"/>
         <location filename="../build/ui_preferences.h" line="1356"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>畫出潛水設備回報的警戒上限深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="855"/>
+        <location filename="../qt-ui/preferences.ui" line="860"/>
         <location filename="../build/ui_preferences.h" line="1357"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>在裝備分頁中顯示未使用的氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="871"/>
         <location filename="../build/ui_preferences.h" line="1358"/>
         <source>Show average depth</source>
         <translation>顯示平均深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="884"/>
+        <location filename="../qt-ui/preferences.ui" line="889"/>
         <location filename="../build/ui_preferences.h" line="1360"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="901"/>
+        <location filename="../qt-ui/preferences.ui" line="906"/>
         <location filename="../build/ui_preferences.h" line="1361"/>
         <source>GFHigh</source>
         <translation>GFhigh</translation>
@@ -5652,42 +5689,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../qt-ui/preferences.cpp" line="120"/>
         <source>Subsurface cloud storage (credentials verified)</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface 雲端裝置 (證件認證)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="329"/>
+        <location filename="../qt-ui/preferences.cpp" line="332"/>
         <source>Restart required</source>
         <translation>需要重新啟動</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="330"/>
+        <location filename="../qt-ui/preferences.cpp" line="333"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>您必須重新啟動 Subsurface 來正確載入新的語言。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="360"/>
-        <location filename="../qt-ui/preferences.cpp" line="382"/>
-        <location filename="../qt-ui/preferences.cpp" line="395"/>
+        <location filename="../qt-ui/preferences.cpp" line="363"/>
+        <location filename="../qt-ui/preferences.cpp" line="385"/>
+        <location filename="../qt-ui/preferences.cpp" line="398"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>雲端裝置 email 與密碼只接受使用字母, 數字, 與 &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, 和 &apos;+&apos;. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="487"/>
+        <location filename="../qt-ui/preferences.cpp" line="492"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>若按下 OK ，則所有 Subsurface 設定將立即被重設回預設值。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="473"/>
+        <location filename="../qt-ui/preferences.cpp" line="478"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="473"/>
+        <location filename="../qt-ui/preferences.cpp" line="478"/>
         <source>Open default log file</source>
         <translation>開啟預設的日誌檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="486"/>
+        <location filename="../qt-ui/preferences.cpp" line="491"/>
         <source>Warning</source>
         <translation>提醒</translation>
     </message>
@@ -5720,24 +5757,24 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../build/ui_printoptions.h" line="158"/>
         <source>One dive per page</source>
-        <translation type="unfinished"/>
+        <translation>每頁一支潛水</translation>
     </message>
     <message>
         <location filename="../build/ui_printoptions.h" line="159"/>
         <source>Two dives per page</source>
-        <translation type="unfinished"/>
+        <translation>每頁兩支潛水</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="41"/>
         <location filename="../build/ui_printoptions.h" line="149"/>
         <source>&amp;Dive list print</source>
-        <translation type="unfinished"/>
+        <translation>列印潛水列表</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="57"/>
         <location filename="../build/ui_printoptions.h" line="151"/>
         <source>&amp;Statistics print</source>
-        <translation type="unfinished"/>
+        <translation>列印統計資訊</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="67"/>
@@ -5761,7 +5798,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <location filename="../qt-ui/printoptions.ui" line="102"/>
         <location filename="../build/ui_printoptions.h" line="155"/>
         <source>Template</source>
-        <translation type="unfinished"/>
+        <translation>樣板</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="127"/>
@@ -5777,12 +5814,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../qt-ui/printoptions.ui" line="141"/>
         <source>Export</source>
-        <translation type="unfinished"/>
+        <translation>匯出</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Import</source>
-        <translation type="unfinished"/>
+        <translation>匯入</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="29"/>
@@ -5793,7 +5830,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../qt-ui/printoptions.cpp" line="150"/>
         <source>Import template file</source>
-        <translation type="unfinished"/>
+        <translation>匯入樣板檔案</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.cpp" line="151"/>
@@ -5804,7 +5841,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../qt-ui/printoptions.cpp" line="163"/>
         <source>Export template files as</source>
-        <translation type="unfinished"/>
+        <translation>匯出樣板檔案至</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.cpp" line="174"/>
+        <source>This action cannot be undone!</source>
+        <translation>此動作無法完成! </translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.cpp" line="175"/>
+        <source>Delete template: %1?</source>
+        <translation>刪除樣板: %1? </translation>
     </message>
 </context>
 <context>
@@ -5883,113 +5930,113 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="658"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 of %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="660"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="663"/>
         <source>Unknown dive computer</source>
         <translation>未知的潛水電腦</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="677"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>當超過處理時間，顯示關閉 NDL / TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1224"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1227"/>
         <source>Make first divecomputer</source>
         <translation>設定第 1 潛水電腦</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1226"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1229"/>
         <source>Delete this divecomputer</source>
         <translation>刪除此潛水電腦</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1240"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1243"/>
         <source>Add gas change</source>
         <translation>增加氣瓶交換</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1243"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1246"/>
         <source> (Tank %1)</source>
         <translation> (Tank %1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1251"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1254"/>
         <source>Add set-point change</source>
         <translation>增加 set-point 變更</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1253"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1256"/>
         <source>Add bookmark</source>
         <translation>新增書籤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1257"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1260"/>
         <source>Edit the profile</source>
-        <translation type="unfinished"/>
+        <translation>編輯摘要</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1261"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Remove event</source>
         <translation>移除事件</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1266"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/>
         <source>Hide similar events</source>
         <translation>隱藏相似事件</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1273"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1276"/>
         <source>Edit name</source>
         <translation>潛水名稱</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1302"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1309"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1305"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1312"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>調整氣瓶 %1 壓力 (以 %2 插入目前位置)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1324"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1327"/>
         <source>Unhide all events</source>
         <translation>取消隱藏所有事件</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1358"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/>
         <source>Hide events</source>
         <translation>隱藏事件</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1358"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/>
         <source>Hide all %1 events?</source>
         <translation>隱藏所有 %1 事件?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1393"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1396"/>
         <source>Remove the selected event?</source>
         <translation>移除所選擇的事件？</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1394"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1397"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1498"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1501"/>
         <source>Edit name of bookmark</source>
         <translation>編輯書籤名稱</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1499"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1502"/>
         <source>Custom name:</source>
         <translation>自訂名稱:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1504"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1507"/>
         <source>Name is too long!</source>
         <translation>名稱太長！</translation>
     </message>
@@ -5997,12 +6044,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1226"/>
+        <location filename="../qthelper.cpp" line="1255"/>
         <source>AIR</source>
         <translation>空氣</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1226"/>
+        <location filename="../qthelper.cpp" line="1255"/>
         <source>OXYGEN</source>
         <translation>OXYGEN</translation>
     </message>
@@ -6027,7 +6074,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>最高</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="322"/>
+        <location filename="../qt-ui/globe.cpp" line="327"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>在地圖上移動, 並且雙擊來設定潛水位置</translation>
     </message>
@@ -6042,62 +6089,62 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1240"/>
+        <location filename="../qthelper.cpp" line="1269"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1241"/>
+        <location filename="../qthelper.cpp" line="1270"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1264"/>
+        <location filename="../qthelper.cpp" line="1293"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1265"/>
+        <location filename="../qthelper.cpp" line="1294"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1287"/>
+        <location filename="../qthelper.cpp" line="1316"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1288"/>
+        <location filename="../qthelper.cpp" line="1317"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1310"/>
+        <location filename="../qthelper.cpp" line="1339"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1311"/>
+        <location filename="../qthelper.cpp" line="1340"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="593"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="604"/>
         <source>Invalid response from server</source>
         <translation>主機回傳不正確的回應.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="601"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="612"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>預期的 XML 標籤 &apos;DiveDateReader&apos;, 取代了 &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="658"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>無法找到預期的 XML 標籤 &apos;DiveDates&apos;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="654"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="665"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>異常的 XML 回應. 第 %1 行: %2</translation>
     </message>
@@ -6105,8 +6152,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1584"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1609"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1634"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1659"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>所選取的潛水電腦，尚未支援此功能</translation>
     </message>
@@ -6135,9 +6182,9 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1708"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1758"/>
         <source>Reset settings failed!</source>
-        <translation type="unfinished"/>
+        <translation>重置設定失敗! </translation>
     </message>
 </context>
 <context>
@@ -6208,12 +6255,14 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <source>Warning!
 Not all images have timestamps in the range between
 30 minutes before the start and 30 minutes after the end of any selected dive.</source>
-        <translation type="unfinished"/>
+        <translation>警示!
+在這區間並非所有影像都帶有時間戳記
+選擇的潛水, 開始的 30 分鐘前與結束的 30 分鐘後. </translation>
     </message>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="137"/>
         <source>Load images even if the time does not match the dive time</source>
-        <translation type="unfinished"/>
+        <translation>即使時間並不符合潛水時間, 也載入影像</translation>
     </message>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="180"/>
@@ -6333,7 +6382,7 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../build/ui_simpledivesiteedit.h" line="104"/>
         <source>Dive site quick edit. Hit ESC or click outside to close</source>
-        <translation type="unfinished"/>
+        <translation>快速編輯潛點. 點選 ESC 或於視窗外任意點選來結束</translation>
     </message>
 </context>
 <context>
@@ -6503,47 +6552,47 @@ Not all images have timestamps in the range between
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="387"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/>
         <source>Webservice</source>
         <translation>網頁服務</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="473"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="484"/>
         <source>Connecting...</source>
         <translation>連結...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="492"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="503"/>
         <source>Download finished</source>
         <translation>下載結束</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="517"/>
         <source>Download error: %1</source>
         <translation>下載失敗: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="516"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
         <source>Connection error: </source>
         <translation>連結錯誤:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="536"/>
         <source>Download successful</source>
         <translation>下載成功</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="519"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="530"/>
         <source>Invalid user identifier!</source>
         <translation>錯誤的使用者 Id !</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="366"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="377"/>
         <source>Enter User ID and click Download</source>
         <translation>輸入使用者 ID 並點選下載</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="522"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="533"/>
         <source>Cannot parse response!</source>
         <translation>回覆無法解析!</translation>
     </message>
@@ -6551,7 +6600,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="659"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
         <source>Suits: </source>
         <translation>潛水衣: </translation>
     </message>
@@ -6578,7 +6627,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="580"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
         <source>Tags: </source>
         <translation>標籤:</translation>
     </message>
@@ -6614,12 +6663,12 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../qt-ui/templateedit.ui" line="37"/>
         <source>Preview</source>
-        <translation type="unfinished"/>
+        <translation>預覽</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="94"/>
         <source>Style</source>
-        <translation type="unfinished"/>
+        <translation>模式</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="104"/>
@@ -6629,27 +6678,27 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../qt-ui/templateedit.ui" line="112"/>
         <source>Arial</source>
-        <translation type="unfinished"/>
+        <translation>Arial</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="117"/>
         <source>Impact</source>
-        <translation type="unfinished"/>
+        <translation>Impact</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="122"/>
         <source>Georgia</source>
-        <translation type="unfinished"/>
+        <translation>Georgia</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="127"/>
         <source>Courier</source>
-        <translation type="unfinished"/>
+        <translation>Courier</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="132"/>
         <source>Verdana</source>
-        <translation type="unfinished"/>
+        <translation>Verdana</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="144"/>
@@ -6659,57 +6708,57 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../qt-ui/templateedit.ui" line="14"/>
         <source>Edit template</source>
-        <translation type="unfinished"/>
+        <translation>編輯樣板</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="165"/>
         <source>Color palette</source>
-        <translation type="unfinished"/>
+        <translation>色盤</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="173"/>
         <source>Default</source>
-        <translation type="unfinished"/>
+        <translation>預設</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="178"/>
         <source>Almond</source>
-        <translation type="unfinished"/>
+        <translation>Almond</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="183"/>
         <source>Shades of blue</source>
-        <translation type="unfinished"/>
+        <translation>藍色燈罩</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="188"/>
         <source>Custom</source>
-        <translation type="unfinished"/>
+        <translation>自訂</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="200"/>
         <source>Line spacing</source>
-        <translation type="unfinished"/>
+        <translation>線寬</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="241"/>
         <source>Template</source>
-        <translation type="unfinished"/>
+        <translation>樣板</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="264"/>
         <source>Colors</source>
-        <translation type="unfinished"/>
+        <translation>顏色</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="280"/>
         <source>Background</source>
-        <translation type="unfinished"/>
+        <translation>背景</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="293"/>
         <source>color1</source>
-        <translation type="unfinished"/>
+        <translation>顏色 1</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="303"/>
@@ -6724,63 +6773,64 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../qt-ui/templateedit.ui" line="320"/>
         <source>Table cells 1</source>
-        <translation type="unfinished"/>
+        <translation>表格欄位 1</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="333"/>
         <source>color2</source>
-        <translation type="unfinished"/>
+        <translation>顏色 2</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="360"/>
         <source>Table cells 2</source>
-        <translation type="unfinished"/>
+        <translation>表格欄位 2</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="373"/>
         <source>color3</source>
-        <translation type="unfinished"/>
+        <translation>顏色 3</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="400"/>
         <source>Text 1</source>
-        <translation type="unfinished"/>
+        <translation>文串 1</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="413"/>
         <source>color4</source>
-        <translation type="unfinished"/>
+        <translation>顏色 4</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="440"/>
         <source>Text 2</source>
-        <translation type="unfinished"/>
+        <translation>字串 2</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="453"/>
         <source>color5</source>
-        <translation type="unfinished"/>
+        <translation>顏色 5</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="480"/>
         <source>Borders</source>
-        <translation type="unfinished"/>
+        <translation>邊框</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.ui" line="493"/>
         <source>color6</source>
-        <translation type="unfinished"/>
+        <translation>顏色 6</translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.cpp" line="135"/>
         <source>Do you want to save your changes?</source>
-        <translation type="unfinished"/>
+        <translation>是否要儲存設定? </translation>
     </message>
     <message>
         <location filename="../qt-ui/templateedit.cpp" line="140"/>
         <source>You are about to modify a template bundled with Subsurface.
 </source>
-        <translation type="unfinished"/>
+        <translation>您正在修改 Subsurface 設定的樣板.
+</translation>
     </message>
 </context>
 <context>
@@ -6808,17 +6858,17 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../tests/testparse.cpp" line="304"/>
         <source>Sample sensor1 pO₂</source>
-        <translation type="unfinished"/>
+        <translation>樣本感測器 1 pO₂</translation>
     </message>
     <message>
         <location filename="../tests/testparse.cpp" line="306"/>
         <source>Sample sensor2 pO₂</source>
-        <translation type="unfinished"/>
+        <translation>樣本感測器 2 pO₂</translation>
     </message>
     <message>
         <location filename="../tests/testparse.cpp" line="308"/>
         <source>Sample sensor3 pO₂</source>
-        <translation type="unfinished"/>
+        <translation>樣本感測器 3 pO₂</translation>
     </message>
     <message>
         <location filename="../tests/testparse.cpp" line="310"/>
@@ -6859,15 +6909,15 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../qt-mobile/TopBar.qml" line="59"/>
         <source>Subsurface mobile</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface mobile</translation>
     </message>
 </context>
 <context>
     <name>TripItem</name>
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="65"/>
-        <source> (%1 shown)</source>
-        <translation> (%1 顯示)</translation>
+        <source>(%1 shown)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6882,7 +6932,7 @@ Not all images have timestamps in the range between
         <location filename="../qt-ui/urldialog.ui" line="52"/>
         <location filename="../build/ui_urldialog.h" line="58"/>
         <source>Enter URL for images</source>
-        <translation type="unfinished"/>
+        <translation>輸入圖片 URL</translation>
     </message>
 </context>
 <context>
@@ -7206,12 +7256,12 @@ Language: %1</source>
         <translation>上傳</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Operation timed out</source>
         <translation>操作時間結束</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="322"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="333"/>
         <source>Transferring data...</source>
         <translation>傳送資料...</translation>
     </message>
@@ -7237,24 +7287,24 @@ Language: %1</source>
 <context>
     <name>WinBluetoothDeviceDiscoveryAgent</name>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="518"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="549"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="525"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="556"/>
         <source>No error</source>
-        <translation type="unfinished"/>
+        <translation>無錯誤</translation>
     </message>
 </context>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1635"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1642"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1651"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1685"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1692"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1701"/>
         <source>Failed!</source>
         <translation>失敗！</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1633"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1654"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1683"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1704"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>此功能目前並不支援所選取的潛水電腦</translation>
     </message>
@@ -7346,45 +7396,45 @@ Maximum</source>
     <message>
         <location filename="../taxonomy.c" line="6"/>
         <source>None</source>
-        <translation type="unfinished"/>
+        <translation>無</translation>
     </message>
     <message>
         <location filename="../taxonomy.c" line="7"/>
         <source>Ocean</source>
-        <translation type="unfinished"/>
+        <translation>海洋</translation>
     </message>
     <message>
         <location filename="../taxonomy.c" line="8"/>
         <source>Country</source>
-        <translation type="unfinished"/>
+        <translation>國家</translation>
     </message>
     <message>
         <location filename="../taxonomy.c" line="9"/>
         <source>State</source>
-        <translation type="unfinished"/>
+        <translation>周</translation>
     </message>
     <message>
         <location filename="../taxonomy.c" line="10"/>
         <source>County</source>
-        <translation type="unfinished"/>
+        <translation>縣</translation>
     </message>
     <message>
         <location filename="../taxonomy.c" line="11"/>
         <source>Town</source>
-        <translation type="unfinished"/>
+        <translation>鄉鎮</translation>
     </message>
     <message>
         <location filename="../taxonomy.c" line="12"/>
         <source>City</source>
-        <translation type="unfinished"/>
+        <translation>城市</translation>
     </message>
 </context>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="643"/>
+        <location filename="../libdivecomputer.c" line="641"/>
         <source>Error parsing the header</source>
-        <translation type="unfinished"/>
+        <translation>檔頭解析錯誤</translation>
     </message>
 </context>
 <context>
@@ -7396,13 +7446,13 @@ Maximum</source>
     </message>
     <message>
         <location filename="../dive.c" line="199"/>
-        <location filename="../qthelper.cpp" line="895"/>
+        <location filename="../qthelper.cpp" line="905"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="203"/>
-        <location filename="../qthelper.cpp" line="898"/>
+        <location filename="../qthelper.cpp" line="908"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -7413,16 +7463,16 @@ Maximum</source>
     </message>
     <message>
         <location filename="../dive.c" line="282"/>
-        <location filename="../qthelper.cpp" line="777"/>
-        <location filename="../qthelper.cpp" line="792"/>
+        <location filename="../qthelper.cpp" line="787"/>
+        <location filename="../qthelper.cpp" line="802"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../dive.c" line="287"/>
-        <location filename="../qthelper.cpp" line="780"/>
-        <location filename="../qthelper.cpp" line="794"/>
+        <location filename="../qthelper.cpp" line="790"/>
+        <location filename="../qthelper.cpp" line="804"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
@@ -7448,28 +7498,28 @@ Maximum</source>
     </message>
     <message>
         <location filename="../dive.c" line="338"/>
-        <location filename="../qthelper.cpp" line="803"/>
         <location filename="../qthelper.cpp" line="813"/>
+        <location filename="../qthelper.cpp" line="823"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
         <location filename="../dive.c" line="342"/>
-        <location filename="../qthelper.cpp" line="801"/>
         <location filename="../qthelper.cpp" line="811"/>
+        <location filename="../qthelper.cpp" line="821"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1559"/>
+        <location filename="../dive.c" line="1579"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) 或 (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="482"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1398"/>
-        <location filename="../planner.c" line="1401"/>
+        <location filename="../planner.c" line="1397"/>
+        <location filename="../planner.c" line="1400"/>
         <source>air</source>
         <translation>air</translation>
     </message>
@@ -7502,7 +7552,7 @@ Maximum</source>
         <location filename="../file.c" line="117"/>
         <location filename="../file.c" line="456"/>
         <location filename="../file.c" line="541"/>
-        <location filename="../file.c" line="938"/>
+        <location filename="../file.c" line="936"/>
         <location filename="../ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>無法讀取 &apos;%s&apos;</translation>
@@ -7516,7 +7566,7 @@ Maximum</source>
     <message>
         <location filename="../file.c" line="458"/>
         <source>Empty file &apos;%s&apos;</source>
-        <translation type="unfinished"/>
+        <translation>空檔案 &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../file.c" line="638"/>
@@ -7727,12 +7777,12 @@ Maximum</source>
         <translation>錯誤的事件編號</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="627"/>
+        <location filename="../libdivecomputer.c" line="625"/>
         <source>Unable to create parser for %s %s</source>
         <translation>無法建立解析 %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="631"/>
         <source>Error registering the data</source>
         <translation>錯誤的登錄資料</translation>
     </message>
@@ -7787,52 +7837,52 @@ Maximum</source>
         <translation>混合氣體解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="653"/>
+        <location filename="../libdivecomputer.c" line="651"/>
         <source>Error parsing the samples</source>
         <translation>樣本解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="790"/>
+        <location filename="../libdivecomputer.c" line="788"/>
         <source>Event: waiting for user action</source>
         <translation>事件: 等待使用者動作</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="798"/>
+        <location filename="../libdivecomputer.c" line="796"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>型號=%u (0x%08x), 韌體=%u (0x%08x), 序號=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="862"/>
+        <location filename="../libdivecomputer.c" line="860"/>
         <source>Error registering the event handler.</source>
         <translation>錯誤的註冊程序.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="867"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Error registering the cancellation handler.</source>
         <translation>錯誤的註冊取消程序.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="888"/>
+        <location filename="../libdivecomputer.c" line="886"/>
         <source>Dive data import error</source>
         <translation>匯入潛水資料錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="927"/>
+        <location filename="../libdivecomputer.c" line="925"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>無法建立 libdivecomputer 上下文</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="934"/>
+        <location filename="../libdivecomputer.c" line="932"/>
         <source>Unable to open %s %s (%s)</source>
         <translation> 無法開啟 %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="958"/>
+        <location filename="../libdivecomputer.c" line="956"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>無權限開啟裝置 %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="522"/>
+        <location filename="../parse-xml.c" line="514"/>
         <source>Strange percentage reading %s
 </source>
         <translation>有問題的讀取比例 %s
@@ -7840,18 +7890,19 @@ Maximum</source>
     </message>
     <message>
         <location filename="../load-git.c" line="189"/>
-        <location filename="../parse-xml.c" line="1240"/>
+        <location filename="../parse-xml.c" line="1232"/>
         <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation type="unfinished"/>
+        <translation>此潛點有複數個 GPS位置; 並 %s
+</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2026"/>
+        <location filename="../parse-xml.c" line="2022"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>無法解析訊息 &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="3619"/>
+        <location filename="../parse-xml.c" line="3631"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>無法開啟樣式 %s</translation>
     </message>
@@ -7862,7 +7913,7 @@ Maximum</source>
     </message>
     <message>
         <location filename="../planner.c" line="1021"/>
-        <location filename="../planner.c" line="1172"/>
+        <location filename="../planner.c" line="1170"/>
         <source>Can&apos;t find gas %s</source>
         <translation>無法找到氣體 %s</translation>
     </message>
@@ -7899,7 +7950,7 @@ Maximum</source>
     <message>
         <location filename="../planner.c" line="557"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation type="unfinished"/>
+        <translation>免責聲明 / 警告: 這是使用新發展的 %s 演算法, 且使用的潛水計畫僅經過有限次數的測試. 我們強烈建議不要僅使用此處模擬結果做為計畫.</translation>
     </message>
     <message>
         <location filename="../planner.c" line="608"/>
@@ -7985,22 +8036,22 @@ Maximum</source>
     <message>
         <location filename="../planner.c" line="583"/>
         <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
+        <translation>基於 Bühlmann ZHL-16B, 以 GFlow = %d 和 GFhigh = %d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="587"/>
         <source>based on VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
+        <translation>基於 VPM-B 於公定保守等級</translation>
     </message>
     <message>
         <location filename="../planner.c" line="589"/>
         <source>based on VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
+        <translation>基於 VPM-B 於 +%d 保守等級</translation>
     </message>
     <message>
         <location filename="../planner.c" line="591"/>
         <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
+        <translation>休閒潛水模式, 基於 Bühlmann ZHL-16B 以 GFlow = %d 和 GFhigh = %d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="812"/>
@@ -8033,12 +8084,12 @@ Maximum</source>
         <translation>低 pO₂ 數值 %.2f 在 %d:%02u 使用氣源 %s 停留深度 %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1406"/>
+        <location filename="../planner.c" line="1405"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1113"/>
+        <location filename="../profile.c" line="1122"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8047,63 +8098,63 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1116"/>
+        <location filename="../profile.c" line="1125"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1120"/>
+        <location filename="../profile.c" line="1129"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1135"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1138"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1131"/>
+        <location filename="../profile.c" line="1140"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1142"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1135"/>
+        <location filename="../profile.c" line="1144"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1146"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1140"/>
+        <location filename="../profile.c" line="1149"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1147"/>
+        <location filename="../profile.c" line="1156"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8112,7 +8163,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1151"/>
+        <location filename="../profile.c" line="1160"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8121,194 +8172,196 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1163"/>
+        <location filename="../profile.c" line="1172"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>安全停留: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1175"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>安全停留: 未知時間 @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1171"/>
+        <location filename="../profile.c" line="1180"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1183"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>減壓: 未知時間 @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1178"/>
+        <location filename="../profile.c" line="1187"/>
         <source>In deco
 </source>
         <translation>減壓中
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1189"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1183"/>
+        <location filename="../profile.c" line="1192"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1186"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>減壓: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1203"/>
         <source>In deco (calc)
 </source>
         <translation>減壓 (計算)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1205"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL:%umin (預計)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1208"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1201"/>
+        <location filename="../profile.c" line="1210"/>
         <source>RBT: %umin
 </source>
-        <translation type="unfinished"/>
+        <translation>RBT: %umin
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1204"/>
+        <location filename="../profile.c" line="1213"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>計算的上限深度 %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1219"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
-        <translation type="unfinished"/>
+        <translation>組織 %.0fmin: %.1f%s
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1225"/>
         <source>heartbeat: %d
 </source>
         <translation>心跳: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1227"/>
         <source>bearing: %d
 </source>
         <translation>方位: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1230"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>至此的平均深度 %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1325"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1329"/>
+        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1337"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1332"/>
+        <location filename="../profile.c" line="1341"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1345"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
+        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1353"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
         <location filename="../qthelper.cpp" line="309"/>
         <source>%1km</source>
-        <translation type="unfinished"/>
+        <translation>%1km</translation>
     </message>
     <message>
         <location filename="../qthelper.cpp" line="311"/>
         <source>%1m</source>
-        <translation type="unfinished"/>
+        <translation>%1m</translation>
     </message>
     <message>
         <location filename="../qthelper.cpp" line="315"/>
         <source>%1mi</source>
-        <translation type="unfinished"/>
+        <translation>%1mi</translation>
     </message>
     <message>
         <location filename="../qthelper.cpp" line="317"/>
         <source>%1yd</source>
-        <translation type="unfinished"/>
+        <translation>%1yd</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="853"/>
+        <location filename="../qthelper.cpp" line="863"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="856"/>
+        <location filename="../qthelper.cpp" line="866"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1009"/>
+        <location filename="../qthelper.cpp" line="1019"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 潛水)</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1014"/>
+        <location filename="../qthelper.cpp" line="1024"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 潛水)</translation>
     </message>
@@ -8323,7 +8376,7 @@ EADD: %d%s
         <translation>岸潛</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="450"/>
+        <location filename="../datatrak.c" line="456"/>
         <location filename="../dive.c" line="23"/>
         <source>drift</source>
         <translation>放流</translation>
@@ -8339,24 +8392,24 @@ EADD: %d%s
         <translation>地洞</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="434"/>
+        <location filename="../datatrak.c" line="440"/>
         <location filename="../dive.c" line="24"/>
         <source>ice</source>
         <translation>冰潛</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="436"/>
+        <location filename="../datatrak.c" line="442"/>
         <source>search</source>
-        <translation type="unfinished"/>
+        <translation>搜尋</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="446"/>
+        <location filename="../datatrak.c" line="452"/>
         <location filename="../dive.c" line="25"/>
         <source>wreck</source>
         <translation>沈船</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="432"/>
+        <location filename="../datatrak.c" line="438"/>
         <location filename="../dive.c" line="25"/>
         <source>cave</source>
         <translation>洞穴</translation>
@@ -8377,157 +8430,157 @@ EADD: %d%s
         <translation>湖泊</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="448"/>
+        <location filename="../datatrak.c" line="454"/>
         <location filename="../dive.c" line="26"/>
         <source>river</source>
         <translation>河流</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="430"/>
+        <location filename="../datatrak.c" line="436"/>
         <location filename="../dive.c" line="27"/>
         <source>night</source>
         <translation>夜潛</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="145"/>
+        <location filename="../datatrak.c" line="150"/>
         <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation type="unfinished"/>
+        <translation>錯誤: 此檔案並非為 DATATRAK 日誌格式</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="277"/>
+        <location filename="../datatrak.c" line="283"/>
         <source>clear</source>
-        <translation type="unfinished"/>
+        <translation>清除</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="280"/>
+        <location filename="../datatrak.c" line="286"/>
         <source>misty</source>
-        <translation type="unfinished"/>
+        <translation>模糊</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="283"/>
+        <location filename="../datatrak.c" line="289"/>
         <source>fog</source>
-        <translation type="unfinished"/>
+        <translation>霧</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="286"/>
+        <location filename="../datatrak.c" line="292"/>
         <source>rain</source>
-        <translation type="unfinished"/>
+        <translation>雨</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="289"/>
+        <location filename="../datatrak.c" line="295"/>
         <source>storm</source>
-        <translation type="unfinished"/>
+        <translation>風暴</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="292"/>
+        <location filename="../datatrak.c" line="298"/>
         <source>snow</source>
-        <translation type="unfinished"/>
+        <translation>雪</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="312"/>
+        <location filename="../datatrak.c" line="318"/>
         <source>No suit</source>
-        <translation type="unfinished"/>
+        <translation>無防寒衣</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="315"/>
+        <location filename="../datatrak.c" line="321"/>
         <source>Shorty</source>
-        <translation type="unfinished"/>
+        <translation>短袖防寒衣</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="318"/>
+        <location filename="../datatrak.c" line="324"/>
         <source>Combi</source>
-        <translation type="unfinished"/>
+        <translation>Combi</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="321"/>
+        <location filename="../datatrak.c" line="327"/>
         <source>Wet suit</source>
-        <translation type="unfinished"/>
+        <translation>濕式防寒衣</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="324"/>
+        <location filename="../datatrak.c" line="330"/>
         <source>Semidry suit</source>
-        <translation type="unfinished"/>
+        <translation>半乾衣</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="327"/>
+        <location filename="../datatrak.c" line="333"/>
         <source>Dry suit</source>
-        <translation type="unfinished"/>
+        <translation>乾式防寒衣</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="387"/>
+        <location filename="../datatrak.c" line="393"/>
         <source>no stop</source>
-        <translation type="unfinished"/>
+        <translation>無停留</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="391"/>
+        <location filename="../datatrak.c" line="397"/>
         <source>single ascent</source>
-        <translation type="unfinished"/>
+        <translation>單一上升</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="393"/>
+        <location filename="../datatrak.c" line="399"/>
         <source>multiple ascent</source>
-        <translation type="unfinished"/>
+        <translation>多層上升</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="395"/>
+        <location filename="../datatrak.c" line="401"/>
         <location filename="../dive.c" line="27"/>
         <source>fresh</source>
         <translation>新進</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="397"/>
+        <location filename="../datatrak.c" line="403"/>
         <source>salt water</source>
-        <translation type="unfinished"/>
+        <translation>鹹水</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="422"/>
+        <location filename="../datatrak.c" line="428"/>
         <source>sight seeing</source>
-        <translation type="unfinished"/>
+        <translation>觀察景象</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="424"/>
+        <location filename="../datatrak.c" line="430"/>
         <source>club dive</source>
-        <translation type="unfinished"/>
+        <translation>社團潛水</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="428"/>
+        <location filename="../datatrak.c" line="434"/>
         <source>instruction</source>
-        <translation type="unfinished"/>
+        <translation>指示</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="454"/>
+        <location filename="../datatrak.c" line="460"/>
         <source>other</source>
-        <translation type="unfinished"/>
+        <translation>其他</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="465"/>
+        <location filename="../datatrak.c" line="471"/>
         <source>Other activities</source>
-        <translation type="unfinished"/>
+        <translation>其它活動</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="489"/>
+        <location filename="../datatrak.c" line="495"/>
         <source>Datatrak/Wlog notes</source>
-        <translation type="unfinished"/>
+        <translation>Datatrak/Wlog 記錄</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="528"/>
+        <location filename="../datatrak.c" line="534"/>
         <source>Manually entered dive</source>
-        <translation type="unfinished"/>
+        <translation>手動輸入潛水</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="579"/>
+        <location filename="../datatrak.c" line="585"/>
         <source>Unknown</source>
-        <translation type="unfinished"/>
+        <translation>未知</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="661"/>
+        <location filename="../datatrak.c" line="671"/>
         <source>Error: couldn&apos;t open the file %s</source>
-        <translation type="unfinished"/>
+        <translation>錯誤: 無法開啟檔案 %s</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="674"/>
+        <location filename="../datatrak.c" line="684"/>
         <source>Error: no dive</source>
-        <translation type="unfinished"/>
+        <translation>錯誤: 無潛水</translation>
     </message>
     <message>
         <location filename="../dive.c" line="27"/>
@@ -8535,7 +8588,7 @@ EADD: %d%s
         <translation>學生</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="452"/>
+        <location filename="../datatrak.c" line="458"/>
         <location filename="../dive.c" line="28"/>
         <source>photo</source>
         <translation>照片</translation>
@@ -8546,13 +8599,13 @@ EADD: %d%s
         <translation>影片</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="426"/>
+        <location filename="../datatrak.c" line="432"/>
         <location filename="../dive.c" line="28"/>
         <source>instructor</source>
         <translation>教練</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="389"/>
+        <location filename="../datatrak.c" line="395"/>
         <location filename="../dive.c" line="29"/>
         <source>deco</source>
         <translation>減壓</translation>
@@ -8570,8 +8623,8 @@ EADD: %d%s
     <message>
         <location filename="../dive.c" line="33"/>
         <location filename="../equipment.c" line="85"/>
-        <location filename="../planner.c" line="1402"/>
-        <location filename="../planner.c" line="1405"/>
+        <location filename="../planner.c" line="1401"/>
+        <location filename="../planner.c" line="1404"/>
         <source>oxygen</source>
         <translation>氧氣</translation>
     </message>
@@ -8626,114 +8679,114 @@ EADD: %d%s
         <translation>(無潛水)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="111"/>
+        <location filename="../subsurfacestartup.c" line="114"/>
         <source>Sun</source>
         <translation>周日</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="111"/>
+        <location filename="../subsurfacestartup.c" line="114"/>
         <source>Mon</source>
         <translation>周一</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="111"/>
+        <location filename="../subsurfacestartup.c" line="114"/>
         <source>Tue</source>
         <translation>周二</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="111"/>
+        <location filename="../subsurfacestartup.c" line="114"/>
         <source>Wed</source>
         <translation>周三</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="111"/>
+        <location filename="../subsurfacestartup.c" line="114"/>
         <source>Thu</source>
         <translation>周四</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="111"/>
+        <location filename="../subsurfacestartup.c" line="114"/>
         <source>Fri</source>
         <translation>周五</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="111"/>
+        <location filename="../subsurfacestartup.c" line="114"/>
         <source>Sat</source>
         <translation>周六</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="120"/>
+        <location filename="../subsurfacestartup.c" line="123"/>
         <source>Jan</source>
         <translation>1月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="120"/>
+        <location filename="../subsurfacestartup.c" line="123"/>
         <source>Feb</source>
         <translation>2月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="120"/>
+        <location filename="../subsurfacestartup.c" line="123"/>
         <source>Mar</source>
         <translation>3月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="120"/>
+        <location filename="../subsurfacestartup.c" line="123"/>
         <source>Apr</source>
         <translation>4月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="120"/>
+        <location filename="../subsurfacestartup.c" line="123"/>
         <source>May</source>
         <translation>5月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="120"/>
+        <location filename="../subsurfacestartup.c" line="123"/>
         <source>Jun</source>
         <translation>6月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="121"/>
+        <location filename="../subsurfacestartup.c" line="124"/>
         <source>Jul</source>
         <translation>7月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="121"/>
+        <location filename="../subsurfacestartup.c" line="124"/>
         <source>Aug</source>
         <translation>8月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="121"/>
+        <location filename="../subsurfacestartup.c" line="124"/>
         <source>Sep</source>
         <translation>9月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="121"/>
+        <location filename="../subsurfacestartup.c" line="124"/>
         <source>Oct</source>
         <translation>10月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="121"/>
+        <location filename="../subsurfacestartup.c" line="124"/>
         <source>Nov</source>
         <translation>11月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="121"/>
+        <location filename="../subsurfacestartup.c" line="124"/>
         <source>Dec</source>
         <translation>12月</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="154"/>
-        <location filename="../parse-xml.c" line="3182"/>
-        <location filename="../uemis-downloader.c" line="131"/>
+        <location filename="../parse-xml.c" line="3177"/>
+        <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="462"/>
+        <location filename="../uemis-downloader.c" line="464"/>
         <source>data</source>
         <translation>資料</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="442"/>
+        <location filename="../uemis-downloader.c" line="444"/>
         <source>%s %s</source>
         <translation>%s %s</translation>
     </message>
@@ -8751,7 +8804,9 @@ and click &apos;Retry&apos;</source>
         <source>Uemis Zurich: the file system is full.
 Disconnect/reconnect the dive computer
 and click Retry</source>
-        <translation type="unfinished"/>
+        <translation>Uemis Zurich: 檔案系統已滿. 
+請中斷 / 重新連結潛水電腦
+並點選 &apos;重試&apos;</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="29"/>
@@ -8761,172 +8816,177 @@ Is the Uemis Zurich plugged in correctly?</source>
 Uemis Zurich 已正確插入？</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="490"/>
+        <location filename="../uemis-downloader.c" line="30"/>
+        <source>No dives to download.</source>
+        <translation>無潛水記錄可下載. </translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="492"/>
         <source>divelog #</source>
         <translation>潛水記錄 #</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="492"/>
+        <location filename="../uemis-downloader.c" line="494"/>
         <source>divespot #</source>
         <translation>潛點 #</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="494"/>
+        <location filename="../uemis-downloader.c" line="496"/>
         <source>details for #</source>
         <translation># 細節</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="695"/>
+        <location filename="../uemis-downloader.c" line="697"/>
         <source>wetsuit</source>
         <translation>濕式防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="695"/>
+        <location filename="../uemis-downloader.c" line="697"/>
         <source>semidry</source>
         <translation>半乾衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="695"/>
+        <location filename="../uemis-downloader.c" line="697"/>
         <source>drysuit</source>
         <translation>乾式防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="696"/>
+        <location filename="../uemis-downloader.c" line="698"/>
         <source>shorty</source>
         <translation>短袖防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="696"/>
+        <location filename="../uemis-downloader.c" line="698"/>
         <source>vest</source>
         <translation>背心</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="696"/>
+        <location filename="../uemis-downloader.c" line="698"/>
         <source>long john</source>
         <translation>長約翰式</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="696"/>
+        <location filename="../uemis-downloader.c" line="698"/>
         <source>jacket</source>
         <translation>夾克式</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="696"/>
+        <location filename="../uemis-downloader.c" line="698"/>
         <source>full suit</source>
         <translation>全身式防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="696"/>
+        <location filename="../uemis-downloader.c" line="698"/>
         <source>2 pcs full suit</source>
         <translation>2 件式防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="697"/>
+        <location filename="../uemis-downloader.c" line="699"/>
         <source>membrane</source>
         <translation>膜組織</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="1193"/>
+        <location filename="../uemis-downloader.c" line="1211"/>
         <source>Initialise communication</source>
         <translation>通訊初始化</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="1196"/>
+        <location filename="../uemis-downloader.c" line="1214"/>
         <source>Uemis init failed</source>
         <translation>Uemis 初始化失敗</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="1208"/>
+        <location filename="../uemis-downloader.c" line="1226"/>
         <source>Start download</source>
         <translation>開始下載</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="203"/>
+        <location filename="../uemis.c" line="201"/>
         <source>Safety stop violation</source>
         <translation>違反安全停留</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="205"/>
+        <location filename="../uemis.c" line="203"/>
         <source>Speed alarm</source>
         <translation>速度提醒</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="208"/>
+        <location filename="../uemis.c" line="206"/>
         <source>Speed warning</source>
         <translation>速度警告</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="210"/>
+        <location filename="../uemis.c" line="208"/>
         <source>pO₂ green warning</source>
         <translation>pO₂ 安全提醒</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="213"/>
+        <location filename="../uemis.c" line="211"/>
         <source>pO₂ ascend warning</source>
         <translation>pO₂ 上升提醒</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="215"/>
+        <location filename="../uemis.c" line="213"/>
         <source>pO₂ ascend alarm</source>
         <translation>pO₂ 上升警告</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="219"/>
+        <location filename="../uemis.c" line="217"/>
         <source>Tank pressure info</source>
         <translation>氣瓶壓力資訊</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="221"/>
+        <location filename="../uemis.c" line="219"/>
         <source>RGT warning</source>
         <translation>RGT 提醒</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="223"/>
+        <location filename="../uemis.c" line="221"/>
         <source>RGT alert</source>
         <translation>RGT 警告</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="225"/>
+        <location filename="../uemis.c" line="223"/>
         <source>Tank change suggested</source>
         <translation>建議氣瓶更換</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="227"/>
+        <location filename="../uemis.c" line="225"/>
         <source>Depth limit exceeded</source>
         <translation>超過潛水深度限制</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="229"/>
+        <location filename="../uemis.c" line="227"/>
         <source>Max deco time warning</source>
         <translation>最大減壓時間提醒</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="231"/>
+        <location filename="../uemis.c" line="229"/>
         <source>Dive time info</source>
         <translation>潛水時間資訊</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="233"/>
+        <location filename="../uemis.c" line="231"/>
         <source>Dive time alert</source>
         <translation>潛水時間警告</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="235"/>
+        <location filename="../uemis.c" line="233"/>
         <source>Marker</source>
         <translation>標記</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="237"/>
+        <location filename="../uemis.c" line="235"/>
         <source>No tank data</source>
         <translation>無氣瓶資料</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="239"/>
+        <location filename="../uemis.c" line="237"/>
         <source>Low battery warning</source>
         <translation>低電量提醒</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="241"/>
+        <location filename="../uemis.c" line="239"/>
         <source>Low battery alert</source>
         <translation>低電量警告</translation>
     </message>
@@ -9250,104 +9310,107 @@ Uemis Zurich 已正確插入？</translation>
     </message>
     <message>
         <location filename="../qthelper.cpp" line="333"/>
-        <location filename="../qthelper.cpp" line="461"/>
+        <location filename="../qthelper.cpp" line="468"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
         <location filename="../qthelper.cpp" line="333"/>
-        <location filename="../qthelper.cpp" line="462"/>
+        <location filename="../qthelper.cpp" line="469"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <location filename="../qthelper.cpp" line="334"/>
-        <location filename="../qthelper.cpp" line="463"/>
+        <location filename="../qthelper.cpp" line="470"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
         <location filename="../qthelper.cpp" line="334"/>
-        <location filename="../qthelper.cpp" line="464"/>
+        <location filename="../qthelper.cpp" line="471"/>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="294"/>
+        <location filename="../git-access.c" line="311"/>
         <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation type="unfinished"/>
+        <translation>遠端裝置與本地端資料分歧. 錯誤: 合併失敗 (%s)</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="119"/>
+        <location filename="../git-access.c" line="130"/>
         <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation type="unfinished"/>
+        <translation>本地端暫存目錄 %s 損壞 - 無法與 Subsurface 雲端進行同步</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="139"/>
-        <location filename="../git-access.c" line="159"/>
+        <location filename="../git-access.c" line="153"/>
+        <location filename="../git-access.c" line="173"/>
         <source>Could not update local cache to newer remote data</source>
-        <translation type="unfinished"/>
+        <translation>無法更新本地端暫存來更新遠端資料</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="152"/>
+        <location filename="../git-access.c" line="166"/>
         <source>Subsurface cloud storage corrupted</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface 雲端裝置中斷</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="235"/>
+        <location filename="../git-access.c" line="252"/>
         <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation type="unfinished"/>
+        <translation>無法更新 Subsurface 雲端裝置, 請稍待後重試</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="324"/>
+        <location filename="../git-access.c" line="341"/>
         <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation type="unfinished"/>
+        <translation>遠端裝置與本機端資料分歧. 無法合併本機端與遠端的差異資料</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="357"/>
+        <location filename="../git-access.c" line="374"/>
         <source>Remote storage and local data diverged</source>
-        <translation type="unfinished"/>
+        <translation>遠端裝置與本機端資料分歧</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="360"/>
+        <location filename="../git-access.c" line="377"/>
         <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation type="unfinished"/>
+        <translation>遠端裝置與本機端資料分歧. 錯誤: 寫入資料失敗 (%s)</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="420"/>
-        <location filename="../git-access.c" line="432"/>
-        <location filename="../git-access.c" line="526"/>
-        <location filename="../git-access.c" line="645"/>
+        <location filename="../git-access.c" line="386"/>
         <source>Problems with local cache of Subsurface cloud data</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface 雲端資料於本機端的暫存錯誤</translation>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="387"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation>搬移暫存資料至 %s. 請再嘗試操作. </translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="618"/>
+        <location filename="../git-access.c" line="686"/>
         <source>Error connecting to Subsurface cloud storage</source>
-        <translation type="unfinished"/>
+        <translation>錯誤連結至 Subsurface 雲端裝置</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="621"/>
+        <location filename="../git-access.c" line="689"/>
         <source>git clone of %s failed (%s)</source>
-        <translation type="unfinished"/>
+        <translation>git clone %s 失敗 (%s)</translation>
     </message>
     <message>
         <location filename="../load-git.c" line="216"/>
-        <location filename="../parse-xml.c" line="1302"/>
+        <location filename="../parse-xml.c" line="1294"/>
         <source>additional name for site: %s
 </source>
-        <translation type="unfinished"/>
+        <translation>潛點別名: %s
+</translation>
     </message>
     <message>
         <location filename="../ostctools.c" line="120"/>
         <location filename="../ostctools.c" line="152"/>
         <source>Unknown DC in dive %d</source>
-        <translation type="unfinished"/>
+        <translation>未知 DC 於潛水 %d</translation>
     </message>
     <message>
         <location filename="../ostctools.c" line="165"/>
         <source>Error - %s - parsing dive %d</source>
-        <translation type="unfinished"/>
+        <translation>錯誤 - %s - 解析潛水 %d</translation>
     </message>
 </context>
 <context>
@@ -9356,7 +9419,7 @@ Uemis Zurich 已正確插入？</translation>
         <location filename="../qt-mobile/main.qml" line="11"/>
         <location filename="../qt-mobile/main.qml" line="96"/>
         <source>Subsurface mobile</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface mobile</translation>
     </message>
 </context>
 <context>
@@ -9455,25 +9518,25 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-ui/plannerSettings.ui" line="261"/>
         <source>VPM-B deco</source>
-        <translation type="unfinished"/>
+        <translation>VPM-B 減壓</translation>
     </message>
     <message>
         <location filename="../qt-ui/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
-        <translation type="unfinished"/>
+        <translation>預留氣源</translation>
     </message>
     <message>
         <location filename="../qt-ui/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
-        <translation type="unfinished"/>
+        <translation>當不需要停留時, 延後氣體交換</translation>
     </message>
     <message>
         <location filename="../qt-ui/plannerSettings.ui" line="323"/>
         <location filename="../build/ui_plannerSettings.h" line="451"/>
         <source>Only switch at required stops</source>
-        <translation type="unfinished"/>
+        <translation>只於需要的停留交換</translation>
     </message>
     <message>
         <location filename="../qt-ui/plannerSettings.ui" line="343"/>
@@ -9606,7 +9669,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-ui/plannerSettings.ui" line="268"/>
         <source>Bühlmann deco</source>
-        <translation type="unfinished"/>
+        <translation>Bühlmann 減壓</translation>
     </message>
     <message>
         <location filename="../qt-ui/plannerSettings.ui" line="370"/>
@@ -9618,24 +9681,24 @@ p, li { white-space: pre-wrap; }
         <location filename="../qt-ui/plannerSettings.ui" line="396"/>
         <location filename="../build/ui_plannerSettings.h" line="443"/>
         <source>Recreational mode</source>
-        <translation type="unfinished"/>
+        <translation>休閒潛水模式</translation>
     </message>
     <message>
         <location filename="../qt-ui/plannerSettings.ui" line="433"/>
         <location filename="../build/ui_plannerSettings.h" line="452"/>
         <source>Min. switch duration</source>
-        <translation type="unfinished"/>
+        <translation>最短交換時間</translation>
     </message>
     <message>
         <location filename="../qt-ui/plannerSettings.ui" line="456"/>
         <location filename="../build/ui_plannerSettings.h" line="444"/>
         <source>Safety stop</source>
-        <translation type="unfinished"/>
+        <translation>安全停留</translation>
     </message>
     <message>
         <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Conservatism level</source>
-        <translation type="unfinished"/>
+        <translation>保守等級</translation>
     </message>
     <message>
         <location filename="../qt-ui/plannerSettings.ui" line="605"/>
author	Dirk Hohndel <dirk@hohndel.org>	2015-10-08 13:11:26 +0100
committer	Dirk Hohndel <dirk@hohndel.org>	2015-10-08 13:11:26 +0100
commit	640c746a1faa77ea13c93582c59b391f7e2816de (patch)
tree	80fa00ea8394e29408295caa9e89c13bb8c188bf /translations/subsurface_zh_TW.ts
parent	4ed418dcc2072936d1629422be2190123fedce65 (diff)
download	subsurface-640c746a1faa77ea13c93582c59b391f7e2816de.tar.gz