diff options
Diffstat (limited to 'translations/subsurface_vi.ts')
| -rw-r--r-- | translations/subsurface_vi.ts | 1251 |
1 files changed, 701 insertions, 550 deletions
diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts index 911d69114..a4e996aa8 100644 --- a/translations/subsurface_vi.ts +++ b/translations/subsurface_vi.ts @@ -37,37 +37,42 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="158"/> + <location filename="../qt-ui/models.cpp" line="71"/> + <source>Switch at</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="162"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="341"/> + <location filename="../qt-ui/models.cpp" line="353"/> <source>Cylinder cannot be removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="342"/> + <location filename="../qt-ui/models.cpp" line="354"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="488"/> + <location filename="../qt-ui/models.cpp" line="502"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="489"/> + <location filename="../qt-ui/models.cpp" line="503"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="512"/> + <location filename="../qt-ui/models.cpp" line="527"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="513"/> + <location filename="../qt-ui/models.cpp" line="528"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -75,7 +80,7 @@ <context> <name>DiveComputerManagementDialog</name> <message> - <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/> + <location filename="../qt-ui/divecomputermanagementdialog.ui" line="17"/> <source>Edit Dive Computer Nicknames</source> <translation>Chỉnh sửa tên thiết bị lặn</translation> </message> @@ -94,22 +99,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Model</source> <translation>Mô hình</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Tên</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1461"/> <source>Clicking here will remove this divecomputer.</source> <translation type="unfinished"/> </message> @@ -117,28 +122,28 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/> <source>air</source> <translation>không khí</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/> <source>EAN%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="99"/> <source>Bailing out to OC</source> <translation>Thoát đến OC</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="101"/> <source> begin</source> <comment>Starts with space!</comment> <translation>bắt đầu</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="102"/> <source> end</source> <comment>Starts with space!</comment> <translation>kết thúc</translation> @@ -147,12 +152,12 @@ <context> <name>DiveGasPressureItem</name> <message> - <location filename="../qt-ui/profile/diveprofileitem.cpp" line="456"/> + <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/> <source>air</source> <translation>không khí</translation> </message> <message> - <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/> + <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/> <source>EAN%1</source> <translation type="unfinished"/> </message> @@ -160,12 +165,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1241"/> + <location filename="../qt-ui/models.cpp" line="1258"/> <source> l/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation type="unfinished"/> </message> @@ -173,112 +178,117 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="48"/> + <location filename="../qt-ui/divelistview.cpp" line="51"/> <source>Show Search Box</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="714"/> + <location filename="../qt-ui/divelistview.cpp" line="743"/> <source>remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="715"/> + <location filename="../qt-ui/divelistview.cpp" line="744"/> <source>create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="716"/> + <location filename="../qt-ui/divelistview.cpp" line="745"/> <source>add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="719"/> + <location filename="../qt-ui/divelistview.cpp" line="746"/> + <source>add dive(s) to trip immediately below</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="749"/> <source>merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="720"/> + <location filename="../qt-ui/divelistview.cpp" line="750"/> <source>merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="726"/> + <location filename="../qt-ui/divelistview.cpp" line="756"/> <source>mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="735"/> + <location filename="../qt-ui/divelistview.cpp" line="765"/> <source>load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="738"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>upload dive(s) to divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="784"/> + <location filename="../qt-ui/divelistview.cpp" line="814"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="801"/> + <location filename="../qt-ui/divelistview.cpp" line="831"/> <source>Open Image Files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="801"/> + <location filename="../qt-ui/divelistview.cpp" line="831"/> <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="760"/> <source>merge selected dives</source> <translation type="unfinished"/> </message> @@ -468,22 +478,22 @@ <context> <name>DivePlannerGraphics</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="117"/> + <location filename="../qt-ui/diveplanner.cpp" line="114"/> <source>10m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="365"/> + <location filename="../qt-ui/diveplanner.cpp" line="364"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation type="unfinished"/> @@ -492,37 +502,42 @@ Please, remove them first.</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="446"/> + <location filename="../qt-ui/diveplanner.cpp" line="445"/> <source>AIR</source> <translation>KHÔNG KHÍ</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1087"/> + <location filename="../qt-ui/diveplanner.cpp" line="1154"/> + <source>Run time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="1156"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1298"/> + <location filename="../qt-ui/diveplanner.cpp" line="1396"/> <source>You are about to discard your plan.</source> <translation type="unfinished"/> </message> @@ -530,17 +545,17 @@ Please, remove them first.</source> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="933"/> + <location filename="../qt-ui/diveplanner.cpp" line="954"/> <source>Dive Planner Points</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="954"/> + <location filename="../qt-ui/diveplanner.cpp" line="983"/> <source>add dive data point</source> <translation type="unfinished"/> </message> @@ -548,72 +563,72 @@ Please, remove them first.</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="93"/> <source>Depth</source> <translation>Độ sâu</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/> <source>Time</source> <translation>Thời gian</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/> <source>Pressure</source> <translation>Áp suất</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/> <source>Temperature</source> <translation>Nhiệt độ</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> <source>Color</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>User Entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Cylinder Index</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>PN2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>PHE</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>PO2</source> <translation>PO2</translation> </message> @@ -621,67 +636,67 @@ Please, remove them first.</source> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1288"/> + <location filename="../qt-ui/models.cpp" line="1305"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1291"/> + <location filename="../qt-ui/models.cpp" line="1308"/> <source>date</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1297"/> + <location filename="../qt-ui/models.cpp" line="1314"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1297"/> + <location filename="../qt-ui/models.cpp" line="1314"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1300"/> + <location filename="../qt-ui/models.cpp" line="1317"/> <source>min</source> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1309"/> + <location filename="../qt-ui/models.cpp" line="1326"/> <source>suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1318"/> + <location filename="../qt-ui/models.cpp" line="1335"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1321"/> + <location filename="../qt-ui/models.cpp" line="1338"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1324"/> + <location filename="../qt-ui/models.cpp" line="1341"/> <source>maxCNS</source> <translation>CNS tối đa</translation> </message> @@ -689,43 +704,43 @@ Please, remove them first.</source> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="517"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="571"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="578"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="111"/> <source>no dives were selected</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/> + <source>failed to create zip file for upload: %s</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/> - <source>cannot create temporary file: %1</source> + <source>cannot create temporary file: %s</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/> - <source>internal error: %1</source> + <source>internal error: %s</source> <translation type="unfinished"/> </message> <message> @@ -734,69 +749,69 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="633"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="825"/> <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="800"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation type="unfinished"/> </message> @@ -919,7 +934,7 @@ Please, remove them first.</source> <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="103"/> + <location filename="../qt-ui/globe.cpp" line="104"/> <source>Edit Selected Dive Locations</source> <translation type="unfinished"/> </message> @@ -928,13 +943,13 @@ Please, remove them first.</source> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="445"/> <source>Dive Notes</source> <translation>Ghi chú về lần lặn</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="468"/> + <location filename="../qt-ui/maintab.cpp" line="469"/> <source>Location</source> <translation>Địa điểm</translation> </message> @@ -960,13 +975,13 @@ Please, remove them first.</source> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.cpp" line="235"/> + <location filename="../qt-ui/maintab.cpp" line="236"/> <source>Air temp</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.cpp" line="236"/> + <location filename="../qt-ui/maintab.cpp" line="237"/> <source>Water temp</source> <translation type="unfinished"/> </message> @@ -992,7 +1007,7 @@ Please, remove them first.</source> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="470"/> <source>Notes</source> <translation>Ghi chú</translation> </message> @@ -1123,13 +1138,13 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="416"/> + <location filename="../qt-ui/maintab.cpp" line="440"/> <source>Trip Notes</source> <translation type="unfinished"/> </message> @@ -1144,61 +1159,61 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="232"/> + <location filename="../qt-ui/maintab.cpp" line="233"/> <source>Air temp [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="233"/> + <location filename="../qt-ui/maintab.cpp" line="234"/> <source>Water temp [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="264"/> + <location filename="../qt-ui/maintab.cpp" line="265"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.cpp" line="267"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="491"/> - <location filename="../qt-ui/maintab.cpp" line="499"/> - <location filename="../qt-ui/maintab.cpp" line="528"/> + <location filename="../qt-ui/maintab.cpp" line="492"/> + <location filename="../qt-ui/maintab.cpp" line="500"/> <location filename="../qt-ui/maintab.cpp" line="529"/> <location filename="../qt-ui/maintab.cpp" line="530"/> + <location filename="../qt-ui/maintab.cpp" line="531"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>chưa rõ</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1006"/> + <location filename="../qt-ui/maintab.cpp" line="1054"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1006"/> + <location filename="../qt-ui/maintab.cpp" line="1054"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>W</source> <translation>W</translation> </message> @@ -1206,109 +1221,109 @@ Please, remove them first.</source> <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="621"/> <source>Filter</source> <translation>Bộ lọc</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Mới</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Lưu lại</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="656"/> - <location filename="../qt-ui/mainwindow.ui" line="659"/> + <location filename="../qt-ui/mainwindow.ui" line="684"/> + <location filename="../qt-ui/mainwindow.ui" line="687"/> <source>Save as</source> <translation>Lưu dưới dạng</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="662"/> + <location filename="../qt-ui/mainwindow.ui" line="690"/> <source>Ctrl+Shift+S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="695"/> + <location filename="../qt-ui/mainwindow.ui" line="698"/> <source>Close</source> <translation>Đóng lại</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation type="unfinished"/> </message> @@ -1323,132 +1338,152 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="326"/> - <source>Enable EAD, END, and EADD</source> + <location filename="../qt-ui/mainwindow.ui" line="300"/> + <source>Show/hide heart rate</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="352"/> + <source>Enable EAD, END, and EADD</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Show NDL / TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="430"/> + <location filename="../qt-ui/mainwindow.ui" line="456"/> <source>Rescale depth axis</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="681"/> + <location filename="../qt-ui/mainwindow.ui" line="709"/> <source>Ctrl+U</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="686"/> + <location filename="../qt-ui/mainwindow.ui" line="714"/> + <source>Export HTML World Map</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="717"/> + <source>Ctrl+H</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="722"/> <source>&Print</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="716"/> + <location filename="../qt-ui/mainwindow.ui" line="752"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="724"/> + <location filename="../qt-ui/mainwindow.ui" line="760"/> <source>Import &GPS data from Subsurface Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Hồ sơ</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Thông tin</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="870"/> + <location filename="../qt-ui/mainwindow.ui" line="906"/> <source>Import from Divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="689"/> + <location filename="../qt-ui/mainwindow.ui" line="945"/> + <source>&Check for Updates</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Ctrl+P</source> <translation type="unfinished"/> </message> @@ -1471,11 +1506,12 @@ Please, remove them first.</source> <location filename="../qt-ui/mainwindow.ui" line="381"/> <location filename="../qt-ui/mainwindow.ui" line="407"/> <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="459"/> <source>...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="300"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>Enable MOD</source> <translation type="unfinished"/> </message> @@ -1500,221 +1536,231 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="378"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>Show SAC Rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="430"/> <source>Enable / Disable the Ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Preferences</source> <translation>Tùy biến</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>DC trước</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>DC tiếp theo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Chọn sự kiện</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Nhập vào kế hoạch</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>Thông tin</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="859"/> + <location filename="../qt-ui/mainwindow.ui" line="895"/> <source>Import Log Files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="862"/> + <location filename="../qt-ui/mainwindow.ui" line="898"/> <source>Import divelog files from other applications</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="878"/> + <location filename="../qt-ui/mainwindow.ui" line="914"/> <source>&Full Screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="881"/> + <location filename="../qt-ui/mainwindow.ui" line="917"/> <source>Toggle Full Screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="884"/> + <location filename="../qt-ui/mainwindow.ui" line="920"/> <source>F11</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="143"/> + <location filename="../qt-ui/mainwindow.cpp" line="173"/> <source>Open File</source> <translation>Mở tập tin</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="200"/> - <location filename="../qt-ui/mainwindow.cpp" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="665"/> + <location filename="../qt-ui/mainwindow.cpp" line="231"/> + <location filename="../qt-ui/mainwindow.cpp" line="346"/> + <location filename="../qt-ui/mainwindow.cpp" line="732"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="276"/> + <location filename="../qt-ui/mainwindow.cpp" line="319"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="342"/> + <location filename="../qt-ui/mainwindow.cpp" line="385"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="564"/> + <location filename="../qt-ui/mainwindow.cpp" line="628"/> <source>Do you want to save the changes you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="566"/> + <location filename="../qt-ui/mainwindow.cpp" line="630"/> <source>Do you want to save the changes you made in the datafile?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Lưu các thay đổi?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="572"/> + <location filename="../qt-ui/mainwindow.cpp" line="636"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="247"/> - <location filename="../qt-ui/mainwindow.cpp" line="870"/> + <location filename="../qt-ui/mainwindow.cpp" line="279"/> + <location filename="../qt-ui/mainwindow.cpp" line="943"/> <source>Save File as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="140"/> - <location filename="../qt-ui/mainwindow.cpp" line="200"/> - <location filename="../qt-ui/mainwindow.cpp" line="276"/> - <location filename="../qt-ui/mainwindow.cpp" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="342"/> - <location filename="../qt-ui/mainwindow.cpp" line="665"/> - <location filename="../qt-ui/mainwindow.cpp" line="1013"/> + <location filename="../qt-ui/mainwindow.cpp" line="170"/> + <location filename="../qt-ui/mainwindow.cpp" line="231"/> + <location filename="../qt-ui/mainwindow.cpp" line="319"/> + <location filename="../qt-ui/mainwindow.cpp" line="346"/> + <location filename="../qt-ui/mainwindow.cpp" line="385"/> + <location filename="../qt-ui/mainwindow.cpp" line="732"/> + <location filename="../qt-ui/mainwindow.cpp" line="1090"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="140"/> + <location filename="../qt-ui/mainwindow.cpp" line="170"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="248"/> + <location filename="../qt-ui/mainwindow.cpp" line="280"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="395"/> + <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <source>Export World Map</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="289"/> + <source>HTML files (*.html)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="438"/> <source>Yearly Statistics</source> <translation>Thống kê từng năm</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="871"/> + <location filename="../qt-ui/mainwindow.cpp" line="944"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="990"/> + <location filename="../qt-ui/mainwindow.cpp" line="1067"/> <source>Open Dive Log File</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="990"/> + <location filename="../qt-ui/mainwindow.cpp" line="1067"/> <source>Dive Log Files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Files (*.xml);;UDDF/UDCF Files(*.uddf *.udcf);;JDiveLog Files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1013"/> + <location filename="../qt-ui/mainwindow.cpp" line="1090"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -1797,177 +1843,192 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="289"/> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="276"/> + <source>Default User ID</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="287"/> + <source>Save User ID locally?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>System</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Độ sâu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="374"/> + <location filename="../qt-ui/preferences.ui" line="401"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="384"/> + <location filename="../qt-ui/preferences.ui" line="411"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="401"/> + <location filename="../qt-ui/preferences.ui" line="428"/> <source>liter</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>ký</translation> </message> - <message> - <location filename="../qt-ui/preferences.ui" line="523"/> - <source>Show units in text labels</source> - <translation type="unfinished"/> - </message> <message utf8="true"> - <location filename="../qt-ui/preferences.ui" line="560"/> + <location filename="../qt-ui/preferences.ui" line="573"/> <source>threshold when showing pO₂</source> <translation type="unfinished"/> </message> <message utf8="true"> - <location filename="../qt-ui/preferences.ui" line="581"/> + <location filename="../qt-ui/preferences.ui" line="594"/> <source>threshold when showing pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="602"/> + <location filename="../qt-ui/preferences.ui" line="615"/> <source>threshold when showing pHe</source> <translation type="unfinished"/> </message> <message utf8="true"> - <location filename="../qt-ui/preferences.ui" line="623"/> + <location filename="../qt-ui/preferences.ui" line="636"/> <source>max ppO₂ when showing MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="644"/> + <location filename="../qt-ui/preferences.ui" line="657"/> <source>draw dive computer reported ceiling red</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="655"/> - <source>unused tanks</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="723"/> + <location filename="../qt-ui/preferences.ui" line="747"/> <source>System Default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Bộ lọc</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Áp suất</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Nhiệt độ</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Cân nặng</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="465"/> + <location filename="../qt-ui/preferences.ui" line="492"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="507"/> <source>Time units</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="486"/> + <location filename="../qt-ui/preferences.ui" line="513"/> <source>Ascent/Descent speed denominator</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="707"/> + <location filename="../qt-ui/preferences.ui" line="668"/> + <source>Show non-used cylinders in Equipment Tab</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="679"/> + <source>show average depth</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="731"/> <source>GFLow at max depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation type="unfinished"/> </message> @@ -1977,32 +2038,32 @@ Please, remove them first.</source> <translation>Tùy biến</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="220"/> + <location filename="../qt-ui/preferences.cpp" line="226"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="328"/> + <location filename="../qt-ui/preferences.cpp" line="342"/> <source>Open Default Log File</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="328"/> + <location filename="../qt-ui/preferences.cpp" line="342"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> @@ -2010,22 +2071,17 @@ Please, remove them first.</source> <context> <name>PrintDialog</name> <message> - <location filename="../qt-ui/printdialog.cpp" line="32"/> + <location filename="../qt-ui/printdialog.cpp" line="45"/> <source>&Preview</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation type="unfinished"/> </message> @@ -2151,72 +2207,72 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1898"/> <source>unknown</source> <translation>chưa rõ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1886"/> + <location filename="../qt-ui/models.cpp" line="1903"/> <source>Dive #%1 - %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1889"/> + <location filename="../qt-ui/models.cpp" line="1906"/> <source>Max depth: %1 %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -2224,40 +2280,75 @@ Please, remove them first.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="692"/> <source>Add Gas Change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="703"/> <source>Add Bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="708"/> <source>Remove Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="713"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="719"/> + <source>Edit name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="733"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="746"/> + <source>Hide events</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="746"/> + <source>Hide all %1 events?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="776"/> + <source>Remove the selected event?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="777"/> + <source>%1 @ %2:%3</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="832"/> + <source>Edit name of bookmark</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="833"/> + <source>Custom name:</source> + <translation type="unfinished"/> + </message> </context> <context> <name>QObject</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="36"/> + <location filename="../qt-ui/diveplanner.cpp" line="35"/> <source>AIR</source> <translation>KHÔNG KHÍ</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="706"/> + <location filename="../qt-ui/diveplanner.cpp" line="727"/> <source>Remove this Point</source> <translation type="unfinished"/> </message> @@ -2267,22 +2358,22 @@ Please, remove them first.</source> <translation>Đóng lại</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Trung bình</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Nhỏ nhất</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Tối đa</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="239"/> + <location filename="../qt-ui/globe.cpp" line="240"/> <source>Move the map and double-click to set the dive location</source> <translation type="unfinished"/> </message> @@ -2290,12 +2381,12 @@ Please, remove them first.</source> <context> <name>RenumberDialog</name> <message> - <location filename="../qt-ui/renumber.ui" line="14"/> + <location filename="../qt-ui/renumber.ui" line="17"/> <source>Renumber</source> <translation>Đánh số lại</translation> </message> <message> - <location filename="../qt-ui/renumber.ui" line="31"/> + <location filename="../qt-ui/renumber.ui" line="43"/> <source>New starting number</source> <translation>Số bắt đầu mới</translation> </message> @@ -2303,52 +2394,52 @@ Please, remove them first.</source> <context> <name>ShiftImageTimesDialog</name> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="20"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="23"/> <source>Shift selected times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="31"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="34"/> <source>Shift times of image(s) by</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="99"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="102"/> <source>earlier</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="142"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="145"/> <source>To compute the offset between the clocks of your dive computer and your camera use your camera to take a picture of your dive compuer displaying the current time. Download that image to your computer and press this button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="152"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="155"/> <source>Determine camera time offset</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="155"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="158"/> <source>Select image of divecomputer showing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="193"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="196"/> <source>Which date and time are displayed on the image?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="181"/> + <location filename="../qt-ui/simplewidgets.cpp" line="203"/> <source>Open Image File</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="183"/> + <location filename="../qt-ui/simplewidgets.cpp" line="205"/> <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -2356,27 +2447,43 @@ Please, remove them first.</source> <context> <name>ShiftTimesDialog</name> <message> - <location filename="../qt-ui/shifttimes.ui" line="20"/> + <location filename="../qt-ui/shifttimes.ui" line="23"/> <source>Shift selected times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="37"/> + <location filename="../qt-ui/shifttimes.ui" line="49"/> <source>Shift times of selected dives by</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="73"/> + <location filename="../qt-ui/shifttimes.ui" line="72"/> + <source>Shifted time:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/shifttimes.ui" line="79"/> + <source>Current time:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/shifttimes.ui" line="86"/> + <location filename="../qt-ui/shifttimes.ui" line="93"/> + <source>0:0</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/shifttimes.ui" line="126"/> <source>h:mm</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation type="unfinished"/> </message> @@ -2412,42 +2519,42 @@ Please, remove them first.</source> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="334"/> <source>Webservice</source> <translation>Dịch vụ web</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Đang kết nối...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Lỗi kết nối:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/> <source>Invalid user identifier!</source> <translation>Nhận dạng người dùng không hợp lệ!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="446"/> <source>Cannot parse response!</source> <translation>Không nhận được trả lời!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Tải về thành công!</translation> </message> @@ -2463,17 +2570,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>bar</source> <translation>bar</translation> </message> @@ -2487,6 +2594,49 @@ Please, remove them first.</source> </message> </context> <context> + <name>UpdateManager</name> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="36"/> + <source>Check for updates.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="37"/> + <source><h3>Subsurface was unable to check for updates.</h3></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="42"/> + <source><br/><b>The following error occurred:</b><br/></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="43"/> + <source><br/><br/><b>Please check your internet connection.</b></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="52"/> + <source>You are using the latest version of subsurface.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="54"/> + <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="../qt-ui/updatemanager.cpp" line="57"/> + <source><b>A new version of subsurface is available.</b><br/><br/>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="60"/> + <source>There was an error while trying to check for updates.<br/><br/>%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>UserManual</name> <message> <location filename="../qt-ui/usermanual.cpp" line="23"/> @@ -2502,12 +2652,12 @@ Please, remove them first.</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>ký</translation> </message> @@ -2541,11 +2691,16 @@ Please, remove them first.</source> </message> <message> <location filename="../qt-ui/webservices.ui" line="85"/> + <source>Save User ID locally?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/webservices.ui" line="92"/> <source>Password</source> <translation>Mật khẩu</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation type="unfinished"/> </message> @@ -2563,37 +2718,37 @@ Please, remove them first.</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Type</source> <translation>Loại</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Cân nặng</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="428"/> <source>Clicking here will remove this weigthsystem.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="442"/> + <location filename="../qt-ui/models.cpp" line="454"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="465"/> + <location filename="../qt-ui/models.cpp" line="478"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="466"/> + <location filename="../qt-ui/models.cpp" line="479"/> <source>m</source> <translation>m</translation> </message> @@ -2601,70 +2756,70 @@ Please, remove them first.</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1656"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1659"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1662"/> <source>Duration Total</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> - <location filename="../qt-ui/models.cpp" line="1669"/> - <location filename="../qt-ui/models.cpp" line="1678"/> + <location filename="../qt-ui/models.cpp" line="1677"/> + <location filename="../qt-ui/models.cpp" line="1686"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source> Minimum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> - <location filename="../qt-ui/models.cpp" line="1672"/> - <location filename="../qt-ui/models.cpp" line="1681"/> + <location filename="../qt-ui/models.cpp" line="1680"/> + <location filename="../qt-ui/models.cpp" line="1689"/> + <location filename="../qt-ui/models.cpp" line="1698"/> <source> Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation type="unfinished"/> @@ -2673,72 +2828,72 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="57"/> + <location filename="../dive.c" line="58"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../dive.c" line="62"/> - <location filename="../qt-gui.cpp" line="348"/> + <location filename="../dive.c" line="63"/> + <location filename="../qt-gui.cpp" line="313"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="66"/> - <location filename="../qt-gui.cpp" line="351"/> + <location filename="../dive.c" line="67"/> + <location filename="../qt-gui.cpp" line="316"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="103"/> - <location filename="../qt-gui.cpp" line="327"/> + <location filename="../dive.c" line="104"/> + <location filename="../qt-gui.cpp" line="292"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../dive.c" line="108"/> - <location filename="../qt-gui.cpp" line="332"/> + <location filename="../dive.c" line="109"/> + <location filename="../qt-gui.cpp" line="297"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../dive.c" line="137"/> - <location filename="../qt-gui.cpp" line="232"/> - <location filename="../qt-gui.cpp" line="247"/> + <location filename="../dive.c" line="138"/> + <location filename="../qt-gui.cpp" line="197"/> + <location filename="../qt-gui.cpp" line="212"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="142"/> - <location filename="../qt-gui.cpp" line="235"/> - <location filename="../qt-gui.cpp" line="249"/> + <location filename="../dive.c" line="143"/> + <location filename="../qt-gui.cpp" line="200"/> + <location filename="../qt-gui.cpp" line="214"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="187"/> - <location filename="../qt-gui.cpp" line="258"/> - <location filename="../qt-gui.cpp" line="268"/> + <location filename="../dive.c" line="188"/> + <location filename="../qt-gui.cpp" line="223"/> + <location filename="../qt-gui.cpp" line="233"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="256"/> - <location filename="../qt-gui.cpp" line="266"/> + <location filename="../dive.c" line="192"/> + <location filename="../qt-gui.cpp" line="221"/> + <location filename="../qt-gui.cpp" line="231"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) hoặc (%s)</translation> </message> <message> <location filename="../divelist.c" line="492"/> - <location filename="../planner.c" line="95"/> - <location filename="../planner.c" line="779"/> - <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="806"/> + <location filename="../planner.c" line="809"/> <location filename="../statistics.c" line="358"/> <location filename="../statistics.c" line="368"/> <source>air</source> @@ -2770,250 +2925,246 @@ Maximum</source> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="107"/> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="378"/> - <location filename="../file.c" line="380"/> + <location filename="../file.c" line="106"/> + <location filename="../file.c" line="369"/> <source>Failed to read '%s'</source> <translation>Thất bại khi đọc dữ liệu '%s'</translation> </message> <message> - <location filename="../file.c" line="419"/> - <location filename="../file.c" line="421"/> - <location filename="../file.c" line="498"/> - <location filename="../file.c" line="500"/> + <location filename="../file.c" line="406"/> + <location filename="../file.c" line="482"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>không</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>dừng lại deco</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>đường dốc</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>trần</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>tải công việc</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>máy phát radio</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>độ xâm phạm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>đánh dấu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>bề mặt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>dừng an toàn</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>thay đổi dưỡng khí</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>dừng an toàn (tự nguyện)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>dừng an toàn (bắt buộc)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>deepstop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>trần (độ an toàn)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>thời gian lặn</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>độ sâu tối đa</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>thời gian không khí</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>thẳng tiến</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>cảnh báo cấp độ mô</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>không dừng lại thời gian</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>chỉ số sự kiện không hợp lệ</translation> </message> <message> - <location filename="../libdivecomputer.c" line="403"/> + <location filename="../libdivecomputer.c" line="405"/> <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="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Lỗi khi đăng ký dữ liệu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Lỗi khi chuyển thông số thời gian</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Lần lặn %d: %s %d %04d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="438"/> + <location filename="../libdivecomputer.c" line="440"/> <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="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <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="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <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="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Lỗi khi thu nhận độ mặn của nước</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <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="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Lỗi khi chuyển thông số các mẫu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <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="../libdivecomputer.c" line="629"/> + <location filename="../libdivecomputer.c" line="631"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>mô hình=%u (0x%08x), firmware=%u (0x%08x), số hiệu=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="689"/> + <location filename="../libdivecomputer.c" line="691"/> <source>Error registering the event handler.</source> <translation>Lỗi khi đăng ký quản lý sự kiện.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <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="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Lỗi khi nhập dữ liệu lặn</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <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="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Không thể mở %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="484"/> + <location filename="../parse-xml.c" line="462"/> <source>Strange percentage reading %s </source> <translation>Đang đọc tỉ lệ lạ %s @@ -3021,85 +3172,79 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Thất bại khi chuyển thông số '%s'. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Thất bại khi chuyển thông số '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1845"/> + <location filename="../parse-xml.c" line="1846"/> <source>Database query get_events failed. </source> <translation>Thất bại khi truy vấn việc nhận_sự kiện từ cơ sở dữ liệu. </translation> </message> <message> - <location filename="../parse-xml.c" line="1852"/> + <location filename="../parse-xml.c" line="1853"/> <source>Database query get_tags failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="176"/> + <location filename="../file.c" line="166"/> <source>Database connection failed '%s'. </source> <translation>Thất bại khi kết nối cơ sở dữ liệu '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1886"/> - <location filename="../parse-xml.c" line="2033"/> + <location filename="../parse-xml.c" line="1887"/> + <location filename="../parse-xml.c" line="2034"/> <source>Database query failed '%s'. </source> <translation>Thất bại khi truy vấn dữ liệu '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1997"/> + <location filename="../parse-xml.c" line="1998"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2004"/> + <location filename="../parse-xml.c" line="2005"/> <source>Database query get_changes failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2011"/> + <location filename="../parse-xml.c" line="2012"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2102"/> + <location filename="../parse-xml.c" line="2103"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="100"/> <location filename="../statistics.c" line="361"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="132"/> + <location filename="../planner.c" line="146"/> + <location filename="../planner.c" line="617"/> <source>Can't find gas %d/%d</source> <translation>Không tìm thấy dưỡng khí %d%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>Quá nhiều dưỡng khí được trộn</translation> </message> <message> - <location filename="../planner.c" line="504"/> + <location filename="../planner.c" line="489"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -3112,355 +3257,361 @@ dựa trên GFlow = %.0f và GFhigh = %.0f </translation> </message> <message> - <location filename="../planner.c" line="545"/> + <location filename="../planner.c" line="530"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Chuyển đến %.*f %s trong %d:%02d phút - thời gian chạy %d:%02u tại %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="539"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Ở %.*f %s đối với %d:%02d phút - thời gian chạy %d:%02u ở %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Chuyển dưỡng khí sang %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Dưỡng khí tiêu thụ: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f%s of %s </translation> </message> <message> - <location filename="../planner.c" line="783"/> + <location filename="../planner.c" line="810"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1231"/> + <location filename="../profile.c" line="1226"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1234"/> + <location filename="../profile.c" line="1229"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1238"/> + <location filename="../profile.c" line="1233"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1244"/> + <location filename="../profile.c" line="1239"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1247"/> + <location filename="../profile.c" line="1242"/> <source>SAC: %2.1fl/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1249"/> + <location filename="../profile.c" line="1244"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1251"/> + <location filename="../profile.c" line="1246"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1253"/> + <location filename="../profile.c" line="1248"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1255"/> + <location filename="../profile.c" line="1250"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1253"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1264"/> + <location filename="../profile.c" line="1260"/> <source>EAD: %d%s -END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1271"/> + <location filename="../profile.c" line="1264"/> + <source>END: %d%s +EADD: %d%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1276"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1274"/> + <location filename="../profile.c" line="1279"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1279"/> + <location filename="../profile.c" line="1284"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1282"/> + <location filename="../profile.c" line="1287"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1286"/> + <location filename="../profile.c" line="1291"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1293"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1292"/> + <location filename="../profile.c" line="1297"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1300"/> + <location filename="../profile.c" line="1305"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1302"/> + <location filename="../profile.c" line="1307"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1305"/> + <location filename="../profile.c" line="1310"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1313"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1314"/> + <location filename="../profile.c" line="1319"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1320"/> + <location filename="../profile.c" line="1325"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1327"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1414"/> + <location filename="../profile.c" line="1419"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1418"/> - <location filename="../profile.c" line="1422"/> - <location filename="../profile.c" line="1426"/> + <location filename="../profile.c" line="1423"/> + <location filename="../profile.c" line="1427"/> + <location filename="../profile.c" line="1431"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1438"/> - <location filename="../profile.c" line="1442"/> + <location filename="../profile.c" line="1443"/> + <location filename="../profile.c" line="1447"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="498"/> + <location filename="../qt-gui.cpp" line="392"/> <source>%1, %2 %3, %4 %5:%6</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>thuyền</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>bờ biển</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>độ trôi</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>sâu</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>hang lớn</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>băng</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>vật trôi dạt</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>hang động</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>độ cao so với mặt biển</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>ao</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>hồ</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>sông</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>ban đêm</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>hình ảnh</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>video</source> <translation>video</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>instructor</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>deco</translation> </message> @@ -3510,97 +3661,97 @@ EADD: %d%s <translation>(không có cuộc lặn nào)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>CN</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>T2</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>T3</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>T4</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>T5</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>T6</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>T7</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Th1</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Th2</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Th3</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>May</source> <translation>Th5</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Th6</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Th7</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Th8</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Th9</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Th10</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Th11</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Th12</translation> </message> |