Latest strings and translations

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

1 files changed, 143 insertions, 129 deletions

diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts
index c330844a4..f24296054 100644
--- a/translations/subsurface_vi.ts
+++ b/translations/subsurface_vi.ts
@@ -31,22 +31,22 @@
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished"/>
+        <translation>Ngày tháng</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
         <source>Time</source>
-        <translation type="unfinished"/>
+        <translation>Thời gian</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
         <source>Duration</source>
-        <translation type="unfinished"/>
+        <translation>Độ dài</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
         <source>Location</source>
-        <translation type="unfinished"/>
+        <translation>Địa điểm</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -56,7 +56,7 @@
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
         <source>Weight</source>
-        <translation type="unfinished"/>
+        <translation>Cân nặng</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -86,17 +86,17 @@
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
         <source>Divemaster</source>
-        <translation type="unfinished"/>
+        <translation>Người lặn giỏi nhất</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
         <source>Buddy</source>
-        <translation type="unfinished"/>
+        <translation>Bạn</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
         <source>Notes</source>
-        <translation type="unfinished"/>
+        <translation>Ghi chú</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -140,22 +140,22 @@
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
-        <source>Sample po2</source>
+        <source>Sample pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
-        <source>Sample cns</source>
+        <source>Sample CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
-        <source>Sample ndl</source>
+        <source>Sample NDL</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
-        <source>Sample tts</source>
+        <source>Sample TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1267,12 +1267,12 @@ bỏ các máy lặn đã được chọn?</translation>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
         <source>Duration</source>
-        <translation type="unfinished"/>
+        <translation>Độ dài</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
         <source>Depth</source>
-        <translation type="unfinished"/>
+        <translation>Độ sâu</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
@@ -1282,7 +1282,7 @@ bỏ các máy lặn đã được chọn?</translation>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
         <source>min</source>
-        <translation type="unfinished"/>
+        <translation>nhỏ nhất</translation>
     </message>
 </context>
 <context>
@@ -1744,7 +1744,7 @@ bỏ các máy lặn đã được chọn?</translation>
         <translation>Xuất dữ liệu từ tập tin HTML dưới dạng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
@@ -1757,7 +1757,7 @@ bỏ các máy lặn đã được chọn?</translation>
         <translation>Nhập dữ liệu từ tập tin ghi nhận các lần lặn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
         <source>Time</source>
         <translation>Thời gian</translation>
     </message>
@@ -1792,37 +1792,37 @@ bỏ các máy lặn đã được chọn?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
         <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
         <source>Date</source>
         <translation>Ngày tháng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
         <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
         <source>O₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
         <source>He</source>
         <translation type="unfinished"/>
     </message>
@@ -1842,140 +1842,163 @@ bỏ các máy lặn đã được chọn?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
         <source>Location</source>
         <translation>Địa điểm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
         <source>Max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
         <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
         <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
         <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
         <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
-        <source>Sample po2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
         <source>Sample cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
         <source>Sample ndl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
         <source>Sample tts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
         <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+        <source>Sample pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+        <source>Sample CNS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+        <source>Sample NDL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+        <source>Sample TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
         <source>Samples pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
         <source>Sample pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
         <source>Mean depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
         <source>Divemaster</source>
-        <translation type="unfinished"/>
+        <translation>Người lặn giỏi nhất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
         <source>Buddy</source>
         <translation>Bạn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
         <source>Notes</source>
         <translation>Ghi chú</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
         <source>Weight</source>
         <translation>Cân nặng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
         <source>Cyl. size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
         <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
         <source>End pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
@@ -2618,7 +2641,7 @@ bỏ các máy lặn đã được chọn?</translation>
     <name>FacebookManager</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="244"/>
-        <source>Photo Upload Sucessfull</source>
+        <source>Photo upload sucessfull</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2627,17 +2650,17 @@ bỏ các máy lặn đã được chọn?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo upload failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -3924,12 +3947,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="795"/>
-        <source>CCR: Show setpoints when viewing pO₂</source>
+        <source>CCR: show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="802"/>
-        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -4922,7 +4945,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="13"/>
+        <location filename="../qt-ui/about.cpp" line="16"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
         <translation type="unfinished"/>
     </message>
@@ -5053,42 +5076,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
         <source>Check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="83"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="86"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="94"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation type="unfinished"/>
     </message>
@@ -5127,8 +5150,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>UserManual</name>
     <message>
         <location filename="../qt-ui/usermanual.cpp" line="54"/>
-        <source>User Manual</source>
-        <translation>Hướng dẫn sử dụng</translation>
+        <source>User manual</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5212,13 +5235,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
-Operating System: %1</source>
+Operating system: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
-CPU Architecture: %1</source>
+CPU architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <source>
+OS CPU architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -5258,12 +5287,6 @@ Language: %1</source>
         <translation>Gửi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
-        <source>
-OS CPU Architecture: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
@@ -5544,7 +5567,7 @@ Maximum</source>
         <translation>(%s) hoặc (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="467"/>
+        <location filename="../divelist.c" line="468"/>
         <location filename="../equipment.c" line="81"/>
         <location filename="../planner.c" line="1081"/>
         <location filename="../planner.c" line="1084"/>
@@ -5769,12 +5792,6 @@ Maximum</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="354"/>
-        <location filename="../cochran.c" line="400"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
         <location filename="../libdivecomputer.c" line="124"/>
         <source>airtime</source>
         <translation>thời gian không khí</translation>
@@ -5790,6 +5807,8 @@ Maximum</source>
         <translation>thẳng tiến</translation>
     </message>
     <message>
+        <location filename="../cochran.c" line="354"/>
+        <location filename="../cochran.c" line="400"/>
         <location filename="../libdivecomputer.c" line="124"/>
         <source>pO₂</source>
         <translation type="unfinished"/>
@@ -6663,31 +6682,6 @@ EADD: %d%s
         <translation>Th12</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="24"/>
-        <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
-        <translation>Uemis Zurich: Hệ thống tập tin đã quá tải
-Ngắt kết nối/kết nối lại thiết bị đo lặn
-và click &apos;Thử lại&apos;</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="25"/>
-        <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
-        <translation>Uemis Zurich: Hệ thống tập tin quá tải
-Ngắt kết nối/kết nối lại thiết bị đo lặn
-và thử lại lần nữa</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="26"/>
-        <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
-        <translation>Ghi ngắn gọn vào tập tin req.txt
-Uemis Zurich đã được gắn vào đúng cách chưa?</translation>
-    </message>
-    <message>
         <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>chưa rõ</translation>
@@ -6703,6 +6697,26 @@ Uemis Zurich đã được gắn vào đúng cách chưa?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../uemis-downloader.c" line="24"/>
+        <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="25"/>
+        <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="26"/>
+        <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../uemis-downloader.c" line="452"/>
         <source>divelog #</source>
         <translation type="unfinished"/>