diff options
Diffstat (limited to 'translations/subsurface_vi.ts')
| -rw-r--r-- | translations/subsurface_vi.ts | 2044 |
1 files changed, 1047 insertions, 997 deletions
diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts index f8a87bed7..c7df75cd6 100644 --- a/translations/subsurface_vi.ts +++ b/translations/subsurface_vi.ts @@ -163,160 +163,160 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <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"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <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"/> </message> @@ -324,12 +324,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -337,7 +337,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1658,100 +1658,100 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Lỗi</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> @@ -1967,22 +1967,22 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Xóa lần lặn</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation type="unfinished"/> </message> @@ -1990,103 +1990,135 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Ngày tháng:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Độ sâu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Cân nặng:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation type="unfinished"/> </message> @@ -2255,104 +2287,119 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Mở rộng tất cả</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Mở ra tất cả</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Mở ra tất cả</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Loại bỏ (các)máy lặn từ chuyến đi</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Tạo một chuyến đi mới phía trước</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Thêm (các)chuyến đi lặn ngay lập tức ở trên</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Thêm (các)chuyến đi lặn ngay lập tức ở dưới</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Gập chuyến đi với chuyến đi trước</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Gộp chuyến đi với chuyến đi bên dưới</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Xóa (các)lần lặn</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Đánh dấu (các)lần lặn không hợp lệ</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Hợp nhất các lần lặn được chọn</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Đánh dấu lại (các)lần lặn</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Mở tập tin hình ảnh</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation type="unfinished"/> </message> </context> <context> @@ -2553,7 +2600,7 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Sáng</translation> </message> @@ -2563,121 +2610,121 @@ GPS location:</source> <translation>Cát</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Xuất dữ liệu dưới dạng Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Xuất dữ liệu từ tập tin HTML dưới dạng</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> @@ -3037,62 +3084,62 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>chưa rõ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation type="unfinished"/> </message> @@ -3293,259 +3340,265 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Ngày tháng</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Xếp hạng</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Độ sâu</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Cân nặng</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Đồ lặn</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Xilan</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Bạn</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Địa điểm</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/nhỏ nhất</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation type="unfinished"/> </message> @@ -3553,23 +3606,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Lỗi</translation> </message> @@ -3579,42 +3632,47 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> @@ -3686,9 +3744,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation type="unfinished"/> </message> @@ -3714,7 +3772,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation type="unfinished"/> </message> @@ -3729,57 +3787,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Thử lại</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Thoát</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Chấp nhậ</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3810,12 +3874,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3823,22 +3887,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3854,17 +3918,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation type="unfinished"/> </message> @@ -3919,17 +3983,17 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> @@ -3945,7 +4009,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> + <source>Traverse media directories</source> <translation type="unfinished"/> </message> <message> @@ -3960,17 +4024,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4063,40 +4127,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation type="unfinished"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Địa điểm</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation type="unfinished"/> </message> @@ -4104,7 +4168,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -4228,8 +4292,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Ghi chú</translation> </message> @@ -4250,19 +4314,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Địa điểm</translation> </message> @@ -4343,7 +4407,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> + <source>Media</source> <translation type="unfinished"/> </message> <message> @@ -4377,53 +4441,53 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -4456,424 +4520,419 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Mới</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Lưu lại</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Lưu dưới dạng</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Đóng lại</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4887,212 +4946,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5148,7 +5207,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> @@ -5156,39 +5215,39 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation type="unfinished"/> </message> @@ -5326,7 +5385,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> + <source>&No default file</source> <translation type="unfinished"/> </message> <message> @@ -5351,6 +5410,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation type="unfinished"/> </message> @@ -5381,29 +5441,54 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5558,7 +5643,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> + <source>Recalculate thumbnails if older than media file</source> <translation type="unfinished"/> </message> <message> @@ -5598,7 +5683,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Hồ sơ</translation> </message> @@ -5677,25 +5762,25 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation type="unfinished"/> @@ -5746,7 +5831,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation type="unfinished"/> </message> @@ -5771,73 +5856,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation type="unfinished"/> </message> @@ -6165,133 +6235,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -6299,53 +6369,53 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> @@ -6395,50 +6465,50 @@ Please export this template to a different file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6446,7 +6516,7 @@ Please export this template to a different file.</source> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation type="unfinished"/> </message> @@ -6538,116 +6608,126 @@ Please export this template to a different file.</source> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Thiết lập</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Trạng thái</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Giao diện</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation type="unfinished"/> </message> @@ -6682,13 +6762,13 @@ Please export this template to a different file.</source> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files 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"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> + <source>Load media files even if the time does not match the dive time</source> <translation type="unfinished"/> </message> <message> @@ -6712,38 +6792,38 @@ Not all images have timestamps in the range between <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation type="unfinished"/> </message> @@ -6836,28 +6916,28 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation type="unfinished"/> </message> @@ -6865,59 +6945,59 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation type="unfinished"/> @@ -7053,65 +7133,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Dịch vụ web</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Đang kết nối...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Nhận dạng người dùng không hợp lệ!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Không nhận được trả lời!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7242,38 +7274,43 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> + <source>Load media from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> + <source>Delete selected media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> <translation type="unfinished"/> </message> </context> @@ -7440,15 +7477,15 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> <translation type="unfinished"/> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation type="unfinished"/> </message> @@ -7647,7 +7684,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -7671,130 +7708,135 @@ mixed from Air and using: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Ngày tháng</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Xếp hạng</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Xilan</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>CNS tối đa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Bạn</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Đồ lặn</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/nhỏ nhất</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Địa điểm</translation> </message> @@ -7808,80 +7850,80 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> + <source>Enter URL for media files</source> <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Chấp nhậ</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation type="unfinished"/> </message> @@ -8053,6 +8095,19 @@ Language: %1</source> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8108,12 +8163,12 @@ Language: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation type="unfinished"/> </message> @@ -8139,8 +8194,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8254,7 +8309,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> @@ -8590,9 +8645,9 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8607,131 +8662,131 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>không khí</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>được tích hợp</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>dây ràng</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>mắt cá chân</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8808,123 +8863,123 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> @@ -9023,149 +9078,149 @@ Maximum</source> <translation>chỉ số sự kiện không hợp lệ</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Lỗi khi chuyển thông số thời gian</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Lỗi khi chuyển thông số thời gian lặn</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Lỗi khi chuyển thông số độ sâu tối đa</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Lỗi khi chuyển tiếp thông số số lượng hỗn hợp dưỡng khí</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Lỗi khi thu nhận độ mặn của nước</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Lỗi khi chuyển thông số hỗn hợp dưỡng khí</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Không thể tạo việc chuyển thông số cho %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Lỗi khi đăng ký dữ liệu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Lỗi khi chuyển thông số các mẫu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Sự kiện: đang đợi thao tác từ người dùng</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Lỗi khi đăng ký quản lý sự kiện.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Lỗi khi đăng ký việc hủy bỏ quản lý.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Lỗi khi nhập dữ liệu lặn</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Không thể tạo nội dung cho thiết bị đo lặn</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Không thể mở %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9188,12 +9243,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Thất bại khi chuyển thông số '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -9224,8 +9279,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation type="unfinished"/> </message> @@ -9487,252 +9542,252 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> @@ -9781,142 +9836,142 @@ EADD: %d%s / %.1fg/ℓ <translation>W</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>KHÔNG KHÍ</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Ngày tháng</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Thời gian</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Địa điểm</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Lần lặn</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Mở rộng tất cả</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Mở ra tất cả</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Thống kê</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Xếp hạng</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Tầm nhìn</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Người lặn giỏi nhất</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Bạn</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Đồ lặn</translation> </message> @@ -9927,180 +9982,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Ghi chú</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Năm</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Loại</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Kích thước</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Cân nặng</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation type="unfinished"/> </message> @@ -10130,62 +10185,62 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Th1</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Th2</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Th3</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Th5</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Th6</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Th7</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Th8</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Th9</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Th10</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Th11</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Th12</translation> </message> @@ -10431,12 +10486,17 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation type="unfinished"/> @@ -10462,77 +10522,77 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Độ sâu</translation> </message> @@ -10577,27 +10637,27 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation type="unfinished"/> </message> @@ -10612,7 +10672,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> @@ -10632,22 +10692,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Tối đa</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> @@ -10660,112 +10720,102 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Thiết lập</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Trợ giúp</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation type="unfinished"/> </message> |