diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts index 7cca135af..bc3b9911f 100644 --- a/translations/subsurface_bg_BG.ts +++ b/translations/subsurface_bg_BG.ts @@ -37,37 +37,42 @@ <translation>O</translation> </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>Кликнете тук за да изтриете бутилка</translation> </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>Бутилката не може да бъде премахната</translation> </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>Този газ се използвза. Само бутилки, които не се използват в гмуркане могат да бъдат премахнати.</translation> </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>бара</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="512"/> + <location filename="../qt-ui/models.cpp" line="527"/> <source>l</source> <translation>л</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="513"/> + <location filename="../qt-ui/models.cpp" line="528"/> <source>cuft</source> <translation>кб.фута</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>Редактирай прякори на леководолазен комютри</translation> </message> @@ -95,22 +100,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>Модел</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>Име на устройство</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Прякор</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>Кликнете тук за да изтриете гмуркачески компютър.</translation> </message> @@ -118,28 +123,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>въздух</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>EAN%1</translation> </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>Връщане към 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> начало</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> край</translation> @@ -148,12 +153,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>въздух</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>EAN%1</translation> </message> @@ -161,12 +166,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>л/мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation>кб.фута/мин</translation> </message> @@ -174,112 +179,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>Покажи Търсене</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>Разшири всички</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>Свиване на всички</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>Свиване на други</translation> </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>Изтрий гмуркане (гмуркания) от пътуване</translation> </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>Създай ново пътуване отгоре</translation> </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>Добави гмуркане (гмуркания) веднага над пътуване</translation> </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>Слей пътуване с горно пътуване</translation> </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>Слей пътуване с долно пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>Изтрий гмуркане (гмуркания)</translation> </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>Маркирай гмуркания (гмуркане) като невалидни</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>Запиши като</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>Експорт като UDDF файл</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>времена на изместване</translation> </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>Качи гмуркане (гмуркания) към Divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>Запиши гмуркания като...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Запиши файла като</translation> </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>UDDF файлове (*.uddf *.UDDF)</translation> </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>Слей избраните гмуркания</translation> </message> @@ -469,22 +479,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>10м</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30фута</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Грешка при позицията на държача</translation> </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>Един или повече от вашите стопове ще бъдат загубени @@ -494,37 +504,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>Въздух</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Финална дълбочина</translation> </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>Продълж. (мин.)</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Използван газ</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation>Изтрий плана?</translation> </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>Вие ще изтриете плана.</translation> </message> @@ -532,17 +547,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>Точки в гмуркачески плановик</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>Достъпни газове</translation> </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>Добави точка в гмуркането</translation> </message> @@ -550,72 +565,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>Дълбочина</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>Време</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>Налягане</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>Температура:</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> @@ -623,67 +638,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>дата</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1297"/> + <location filename="../qt-ui/models.cpp" line="1314"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1297"/> + <location filename="../qt-ui/models.cpp" line="1314"/> <source>ft</source> <translation>фута</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1300"/> + <location filename="../qt-ui/models.cpp" line="1317"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>lbs</source> <translation>паунда</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1309"/> + <location filename="../qt-ui/models.cpp" line="1326"/> <source>suit</source> <translation>водолазен костюм</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>бут.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>местонахождение</translation> </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</translation> </message> @@ -691,44 +706,44 @@ 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>Грешен отговор от сървъра</translation> </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>Очакван XML таг 'DiveDateReader', вместо това получен '%1</translation> </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>Очакван XML таг 'DiveDates' не беше намерен</translation> </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>Грешен XML отговор. Ред %1: %2</translation> </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>няма избрани гмуркания</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> - <translation>не може да бъде създаден ZIP файл: %1</translation> + <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> - <translation>не може да бъде създаден файл: %1</translation> + <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> - <translation>вътрешна грешка: %1</translation> + <source>internal error: %s</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> @@ -736,70 +751,70 @@ Please, remove them first.</source> <translation>вътрешна грешка</translation> </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>Готово</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>Обновяване на списъка от гмуркания...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>Изтегляне на списък от гмуркания...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>Изтегляне на %1 гмуркания...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>Изтеглянето приключи - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Неправилно изтегляне</translation> </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>Архива не може да бъде отворен: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>Грешка при качването</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Успешно качване</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>Грешка при логин</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>Не може да бъде направен разбор на отговора</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Грешка: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Качването приключи</translation> </message> @@ -922,7 +937,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>Редактирай избраните местонахождения</translation> </message> @@ -931,13 +946,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>Бележки</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>Местонахождение</translation> </message> @@ -963,13 +978,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>Темп. на въздух</translation> </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>Темп. на водата</translation> </message> @@ -995,7 +1010,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>Бележки</translation> </message> @@ -1126,13 +1141,13 @@ Please, remove them first.</source> <translation>Добави система за тежест</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Местонахождение на пътуване</translation> </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>Бележки за пътуване</translation> </message> @@ -1147,61 +1162,61 @@ Please, remove them first.</source> <translation>Отмяна</translation> </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>Това пътуване се редактира.</translation> </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>Редактира се повече от едно гмуркане.</translation> </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>Това гмуркане се редактира.</translation> </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>/м</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1006"/> + <location filename="../qt-ui/maintab.cpp" line="1054"/> <source>N</source> <translation>С</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1006"/> + <location filename="../qt-ui/maintab.cpp" line="1054"/> <source>S</source> <translation>Ю</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>E</source> <translation>И</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>W</source> <translation>З</translation> </message> @@ -1209,109 +1224,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>Филтър</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>&Регистър</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>&Изглед</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>&Помощ</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>&Вмъкване</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>&Нов регистър</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Нов</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>&Отвори регистър</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Отвори</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>&Запиши</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Запиши</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Запиши като...</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>Ctrl+Shift+S</translation> </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>Затвори</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>Експорт на &UDDF...</translation> </message> @@ -1326,132 +1341,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>Ctrl+U</translation> </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>&Напечатай</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>&Изход</translation> </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>Изтегли от леководолазен &компютър</translation> </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>Вмъкни &GPS данни от Subsurface Service</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>&Редактирай имена на устройства</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>&Преномерирай</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>Годишни &статистики</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Списък на гмуркания</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Профил</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Информация</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Всички</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>Ръководство за &потребителя</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Глобус</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>&Планирай гмуркане</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>Вмъкни от Divelogs.de</translation> </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>Ctrl+P</translation> </message> @@ -1474,11 +1509,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>...</translation> </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> @@ -1503,221 +1539,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>Настройки</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Добави гмуркане</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Автоматично групиране</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>Предишен ГК</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Ляво</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>Следващ ГК</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Дясно</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Избери събития</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Въведи план</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>За Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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>Отвори файл</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>Моля затворете текущата редакция на гмуркане преди да затворите файла.</translation> </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>Моля запишете или отменете текущата редакция на гмуркане преди да отворите плановика.</translation> </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>Моля запишете или отменете текущата редакция на гмуркане преди да добавите гмуркане.</translation> </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>Желаете ли да запишете промените във файла %1?</translation> </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>Желаете ли да запишете промените във файла с данни?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Запиши промените?</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>Промените ще бъдат изгубени ако не ги запишете.</translation> </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>Запиши файла като</translation> </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>Предупреждение</translation> </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>Моля запишете или отменете текущата редакция на гмуркане преди да отворите нов файл.</translation> </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>UDDF файлове (*.uddf *.UDDF)</translation> </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>Годишни статистики</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>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation> </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> @@ -1800,177 +1846,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>Състема</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Метрична</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Империална</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Настройки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Дълбочина</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>метър</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>фута</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="374"/> + <location filename="../qt-ui/preferences.ui" line="401"/> <source>bar</source> <translation>бара</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>литра</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>кб. фут</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>целзии</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>фаренхайт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>кг</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>По подразбиране на системата</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Филтър</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Налягане</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Обем</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Температура:</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Тежест</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="465"/> + <location filename="../qt-ui/preferences.ui" line="492"/> <source>lbs</source> <translation>паунда</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="507"/> <source>Time units</source> <translation>Единици за време</translation> </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>Знаменател за скорост на изкачване/спускане</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Минути</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Секунди</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Покажи</translation> </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>GFLow на макс. дълбочина</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Общи</translation> </message> @@ -1980,32 +2041,32 @@ Please, remove them first.</source> <translation>Настройки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>Нужен рестарт</translation> </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>За да смените успешно език е необходим рестарт на Subsurface.</translation> </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>Отвори файла по подразбиране</translation> </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>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation> </message> @@ -2013,22 +2074,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>&Преглед</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>Пе&чатане</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>&Затвори</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Напечатай</translation> </message> @@ -2154,72 +2210,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>неизвестно</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>Гмуркане №%1 - %2</translation> </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>Макс. дълбочина: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Времетраене: %1 мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Използван газ:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>Тежести:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Бележки:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Водач:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Партньор:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Водолазен костюм:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Видимост:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Оценка:</translation> </message> @@ -2227,40 +2283,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>Добави промяна на газа</translation> </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>Добави бележка</translation> </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>Премахни събитие</translation> </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>Премахни малки събития</translation> </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>Покажи всички събития</translation> </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>Въздух</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>Изтрий тази точка</translation> </message> @@ -2270,22 +2361,22 @@ Please, remove them first.</source> <translation>Затвори</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Средно</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Минимум</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Максимум</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>Кликнете два пъти на глобус картата за да дефинирате местонахождение на гмуркането.</translation> </message> @@ -2293,12 +2384,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>Преномерирай</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>Нов стартов номер</translation> </message> @@ -2306,52 +2397,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>Измести избраните времена</translation> </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>по-рано</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>по-късно</translation> </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> @@ -2359,27 +2450,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>Измести избраните времена</translation> </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>Измести времената в избраните гмуркания с</translation> </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>ч:мм</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>по-рано</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>по-късно</translation> </message> @@ -2415,42 +2522,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>Уеб услуга</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Свръзване...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>Изтеглянето приключи</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>Грешка при изтеглянето: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Грешка при връзка: </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>Грешен потребителски ключ</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>Не може да бъде напревен разряд!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Успешно изтегляне!</translation> </message> @@ -2466,17 +2573,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>Описание</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>мл.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>bar</source> <translation>бара</translation> </message> @@ -2489,6 +2596,49 @@ Please, remove them first.</source> <translation>Информация</translation> </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> @@ -2505,12 +2655,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>Описание</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>кг</translation> </message> @@ -2544,11 +2694,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>Парола</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Качи</translation> </message> @@ -2566,37 +2721,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>Тип</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Тежест</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>Кликнете тук за да изтриете система за тежест.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="442"/> + <location filename="../qt-ui/models.cpp" line="454"/> <source>lbs</source> <translation>паунда</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="465"/> + <location filename="../qt-ui/models.cpp" line="478"/> <source>ft</source> <translation>фута</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="466"/> + <location filename="../qt-ui/models.cpp" line="479"/> <source>m</source> <translation>м</translation> </message> @@ -2604,79 +2759,79 @@ 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>Година > Месец / Пътуване</translation> </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>Продължителност Общо</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> Средно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> Най-късо</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> Най-дълго</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Дълбочина (%1) Средно</translation> </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> Минимум</translation> </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> Максимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Средно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Темп. (%1) @@ -2686,72 +2841,72 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="57"/> + <location filename="../dive.c" line="58"/> <source>pascal</source> <translation>паскала</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>бара</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>л</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>кб.фута</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>м</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>фута</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>паунда</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>кг</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) или (%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> @@ -2783,250 +2938,246 @@ Maximum</source> <translation>щипка</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>Не може да бъде прочетен '%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>Максималният потдържан брой на CSV колони е %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>няма</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>деко. стоп</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>покачване</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>таван</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>натовареност</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>предавател</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>нарушение</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>бележка</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>повърхност</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>безопасен стоп</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>смяна на газ</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>безопасен стоп (свободен)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>безопасен стоп (задължителен)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>дълбочина на спиране</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>таван (безопасен стоп)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>време за гмуркане</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>под</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>макс. дълбочина</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>време за въздух</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>посока</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>внимание: ниво на тъканта</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>нон стоп време</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>грешен номер на събитие</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>Не може да бъде създаден разряд за %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Грешка при регистриране на данни</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Грешка при разряд на дата и час</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Гмуркане №%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>Грешка при рaзряд на време за гмуркане</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Грешка при р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>Грешка при рaзряд на газ микс брой</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Грешка при прием на водна соленост</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Грешка при прием на повърхностно налягане</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Грешка при рaзряд на газ микс</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Грешка при рaзряд на стойности</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Събитие: изчаквание на действие от потребителя</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%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>Грешка при регистриране на направление за събития</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Грешка при регистриране на направление за отменяне</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Грешка при вход на данни</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>Не може да бъде създаден libdivecomputer контекст</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Не може да бъдe отворен %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>Неразпозната стойност за проценти %s @@ -3034,85 +3185,79 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Не може да бъде напревен разбор на '%s'. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Не може да бъде напревен разбор на '%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>Базата данни не може да изпълни get_events. </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>Няма връзка към базата данни '%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>Грешка при заява към база данни '%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>Не може да бъде отворен стилов файл %s</translation> </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>Не може да бъде намерен газ %d/%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>Твърде много газови смеси</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 @@ -3125,357 +3270,363 @@ Subsurface планиране </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>Преход към %.*f %s за %d:%02d мин - времетраене %d:%02u на %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 за %d:%02d мин - времетраене %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>Превключи газ на %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Консумация на газ: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f%s от %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>%sT: %d:%02d мин</translation> </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>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 гмуркания)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 гмуркане)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>кораб</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>бряг</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>дрейф</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>дълбоко</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>каверна</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>лед</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>останки</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>пещера</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>височина</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>басейн</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>езеро</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>река</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>вечер</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>нов</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>студент</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>снимка</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>video</source> <translation>видео</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>instructor</source> <translation>инструктор</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>деко</translation> </message> @@ -3525,97 +3676,97 @@ EADD: %d%s <translation>(няма гмуркания)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>Нед</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Пон</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Вт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>Ср</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Чет</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Пет</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>Съб</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Ян</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Фев</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Март</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Apr</source> <translation>Апр</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>May</source> <translation>Май</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Юни</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Юли</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Авг</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Сеп</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Окт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Нов</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Дек</translation> </message> diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts index df973da3b..600b11a98 100644 --- a/translations/subsurface_da_DK.ts +++ b/translations/subsurface_da_DK.ts @@ -37,37 +37,42 @@ <translation>O</translation> </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>Klik her vil fjerne flasken</translation> </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>Flasken kan ikke fjernes</translation> </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>Denne flaske er i brug. Kun flasker som ikke er i brug kan slettes</translation> </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>Rediger dykkercomputer navne</translation> </message> @@ -95,22 +100,22 @@ fjerne den valgte dykkercomputer?</translation> <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>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>Enheds ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Kaldenavn</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>Klik her, vil fjerne denne dykkercomputer</translation> </message> @@ -118,28 +123,28 @@ fjerne den valgte dykkercomputer?</translation> <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>luft</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>EAN%1</translation> </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>BailOut til 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>start</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>slut</translation> @@ -148,12 +153,12 @@ fjerne den valgte dykkercomputer?</translation> <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>luft</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>EAN%1</translation> </message> @@ -161,12 +166,12 @@ fjerne den valgte dykkercomputer?</translation> <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>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation> cuft/min</translation> </message> @@ -174,112 +179,117 @@ fjerne den valgte dykkercomputer?</translation> <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>Vis søgebox</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>Vis alt</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>Skjul alt</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>Saml andre</translation> </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>Fjern dyk fra tur</translation> </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>Opret ny tur over</translation> </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>Tilføj dyk til tur umiddelbart over</translation> </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>Flet tur med ovenstående</translation> </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>Flet tur med efterstående</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>Slet dyk</translation> </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>Marker dyk som ugyldig(e)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>Gem som</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>Exporter som UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>Skift tider</translation> </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"/> + <translation>Vis billeder</translation> </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>Upload dyk til divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>Gem dyk som...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Gem fil som</translation> </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>UDDF filer (*.uddf *.UDDF)</translation> </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"/> + <translation>Åben billed filer</translation> </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"/> + <translation>Billed filer (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="760"/> <source>merge selected dives</source> <translation>Flet valgte dyk</translation> </message> @@ -289,17 +299,17 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="14"/> <source>Import dive log file</source> - <translation type="unfinished"/> + <translation>Importer dykkerlog</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="36"/> <source>Import CSV Dive Log Files</source> - <translation type="unfinished"/> + <translation>Importer CSV dykkerlog</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="50"/> <source>CSV options</source> - <translation type="unfinished"/> + <translation>CSV muligheder</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="62"/> @@ -310,7 +320,7 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="86"/> <source>Pre-configured imports</source> - <translation>For-konfigurerede imports</translation> + <translation>Pre-konfigurerede imports</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="114"/> @@ -370,12 +380,12 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="278"/> <source>Manual dives</source> - <translation type="unfinished"/> + <translation>Manuelle dyk</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="302"/> <source>Dive #</source> - <translation type="unfinished"/> + <translation>Dyk #</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="315"/> @@ -395,22 +405,22 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="367"/> <source>Location</source> - <translation>Position</translation> + <translation>Lokation</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> <source>Gps</source> - <translation type="unfinished"/> + <translation>Gps</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="393"/> <source>Max depth</source> - <translation type="unfinished"/> + <translation>Max dybde</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="406"/> <source>Mean depth</source> - <translation type="unfinished"/> + <translation>Gnm dybde</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="419"/> @@ -469,22 +479,22 @@ fjerne den valgte dykkercomputer?</translation> <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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Handler Position Error</translation> </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>Et eller flere af dine stop vil gå tabt ved denne handling, @@ -494,37 +504,42 @@ slet dem venligst først.</translation> <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>LUFT</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Slut Dybde</translation> </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>Varighed</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Brugt Gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>CC Set Punkt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation> Kassér Planen?</translation> </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>Du er ved kassére din plan.</translation> </message> @@ -532,17 +547,17 @@ slet dem venligst først.</translation> <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>Dive Planner Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>Gasser tilrådighed</translation> </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>Tilføj dykker data point</translation> </message> @@ -550,72 +565,72 @@ slet dem venligst først.</translation> <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>Dybde</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>Tid</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>Tryk</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>Temperatur</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"/> + <translation>Farve</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <source>User Entered</source> + <translation>Bruger indtastet</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> - <source>User Entered</source> - <translation type="unfinished"/> + <source>Cylinder Index</source> + <translation>Flaske index</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> - <source>Cylinder Index</source> - <translation type="unfinished"/> + <source>Pressure S</source> + <translation>Tryk S</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> - <source>Pressure S</source> - <translation type="unfinished"/> + <source>Pressure I</source> + <translation>Tryk I</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> - <source>Pressure I</source> - <translation type="unfinished"/> + <source>Ceiling</source> + <translation>Loft</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> - <source>Ceiling</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <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"/> + <translation>PN2</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <source>PHE</source> + <translation>PHE</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> - <source>PHE</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>PO2</source> <translation>PO2</translation> </message> @@ -623,67 +638,67 @@ slet dem venligst først.</translation> <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>Dato</translation> </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>fod</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1300"/> + <location filename="../qt-ui/models.cpp" line="1317"/> <source>min</source> <translation>min.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</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>Dragt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>Sted</translation> </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>MaxCNS</translation> </message> @@ -691,44 +706,44 @@ slet dem venligst først.</translation> <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>Ugyldigt svar fra serveren</translation> </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>Forventet XML tag 'DiveDateReader', fik istedet '%1</translation> </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>Forventet XML tag 'DiveDates' ikke fundet</translation> </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>Ugyldig XML svar. Linje %1: %2</translation> </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>ingen dyk var valgt</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> - <translation>Kunne ikke danne en zip fil til upload: %1</translation> + <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> - <translation>Kan ikke danne midlertidig fil: %1</translation> + <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> - <translation>Intern fejl: %1</translation> + <source>internal error: %s</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> @@ -736,70 +751,70 @@ slet dem venligst først.</translation> <translation>Intern fejl</translation> </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>Færdig</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>Uploader dyk liste...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>Downloader dyk liste...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>Downloader %1 dyk...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>Download færdig - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Fejl i download</translation> </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>Arkivet kunne i åbnes: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>Upload fejlede</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Uploadet med succes</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>Login fejlede</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>Kan ikke fortolke svar</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Fejl: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Upload færdig</translation> </message> @@ -826,7 +841,7 @@ slet dem venligst først.</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/> <source>Find Uemis dive computer</source> - <translation type="unfinished"/> + <translation>Find Uemis dykker computer</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/> @@ -922,7 +937,7 @@ slet dem venligst først.</translation> <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>Rediger valgte dykker steder</translation> </message> @@ -931,13 +946,13 @@ slet dem venligst først.</translation> <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>Dyk Noter</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>Position</translation> </message> @@ -963,13 +978,13 @@ slet dem venligst først.</translation> </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>Luft temp</translation> </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>Vand temp</translation> </message> @@ -995,7 +1010,7 @@ slet dem venligst først.</translation> </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>Noter</translation> </message> @@ -1126,13 +1141,13 @@ slet dem venligst først.</translation> <translation>Tilføj vægt system</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Tur position</translation> </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>Tur noter</translation> </message> @@ -1146,62 +1161,62 @@ slet dem venligst først.</translation> <source>Cancel</source> <translation>Fortryd</translation> </message> - <message> - <location filename="../qt-ui/maintab.cpp" line="232"/> - <source>Air temp [%1]</source> - <translation type="unfinished"/> - </message> <message> <location filename="../qt-ui/maintab.cpp" line="233"/> - <source>Water temp [%1]</source> - <translation type="unfinished"/> + <source>Air temp [%1]</source> + <translation>Luft temp [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="234"/> + <source>Water temp [%1]</source> + <translation>Vand temp [%1]</translation> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>This trip is being edited.</source> <translation>Turen er ved at blive rettet.</translation> </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>Flere dyk bliver rettet.</translation> </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>Dette dyk bliver rettet.</translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>Ukendt</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>Ø</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>W</source> <translation>V</translation> </message> @@ -1209,256 +1224,276 @@ slet dem venligst først.</translation> <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>Filter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>&Fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>&Vis</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>&Hjælp</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>&Importer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>&Ny logbog</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Ny</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Crtl-N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>&Åben logbog</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Åben</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Crtl-O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>&Gem</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Gem</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Crtl+S</translation> </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>Gem som</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>Ctrl+Shift+S</translation> </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>Luk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+l</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>Export &UDDF</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="138"/> <source>Enable the pN2 Graph</source> - <translation type="unfinished"/> + <translation>Vis pN2 graf</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="164"/> <source>Enable the pHe graph</source> - <translation type="unfinished"/> + <translation>Vis pHe graf</translation> </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>Vis EAD, END, og EADD</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Show NDL / TTS</source> - <translation type="unfinished"/> + <translation>Vis NDL / TTS</translation> </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"/> + <translation>Skaler dybde aksen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="681"/> + <location filename="../qt-ui/mainwindow.ui" line="709"/> <source>Ctrl+U</source> <translation>Ctrl+U</translation> </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>&Print</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>&Afslut</translation> </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>Importer fra &dive computer</translation> </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>Importer GPS data fra Subsurface WeBServices</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>&Edit Enheds navne</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>&Re-Nummerer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>&Årlig Statistik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Liste</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Alt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>Bruger &Manual</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Globus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> - <translation>Plan Dive</translation> + <translation>P&lan Dyk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>Importer fra Divelog.de</translation> </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>Ctrl+P</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="112"/> <source>Enable the pO2 Graph</source> - <translation type="unfinished"/> + <translation>Vis pO2 Graf</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="115"/> @@ -1474,252 +1509,263 @@ slet dem venligst først.</translation> <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>...</translation> </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"/> + <translation>Vis MOD</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="193"/> <source>Show the DC Reported Ceiling</source> - <translation type="unfinished"/> + <translation>Vis computeres loft</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="222"/> <source>Show the Calculated Ceiling</source> - <translation type="unfinished"/> + <translation>Vis beregnet loft</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="274"/> <source>Show Calculated Ceiling with 3m Increments</source> - <translation type="unfinished"/> + <translation>Vis beregnet loft med 3m interval</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="248"/> <source>Calculate All Tissues</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.ui" line="378"/> - <source>Show SAC Rate</source> - <translation type="unfinished"/> + <translation>Beregn alle væv</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="404"/> - <source>Enable / Disable the Ruler</source> - <translation type="unfinished"/> + <source>Show SAC Rate</source> + <translation>Vis SAC rate</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="430"/> + <source>Enable / Disable the Ruler</source> + <translation>Vis / skjul linealen</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Preferences</source> <translation>Indstillinger</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Tilføj Dyk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Auto Gruppering</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>Forrige DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Venstre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>Næste DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Højre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Vælg hændelser</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Input Plan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>Om Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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"/> + <translation>Importer log filer</translation> </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"/> + <translation>Importer dykkerlog fra andre programmer</translation> </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"/> + <translation>&Fuld Skærm</translation> </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"/> + <translation>Skift Fuld Skærm</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="884"/> + <location filename="../qt-ui/mainwindow.ui" line="920"/> <source>F11</source> - <translation type="unfinished"/> + <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="143"/> + <location filename="../qt-ui/mainwindow.cpp" line="173"/> <source>Open File</source> <translation>Åben fil</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>Gem eller fortryd venligst denne rettelse før du lukker filen</translation> </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>Gem eller fortryd venligst dette dyk før du laver en dykkerplan</translation> </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>Gem eller fortryd venligst dette dyk før du tilføjer et dyk</translation> </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>Vil du gemme ændringerne du lavede i filen %1?</translation> </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>Vil du gemme ændringerne du lavede i filen?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Gem ændringer?</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>Ændringer vil blive tabt hvis du ikke gemmer dem.</translation> </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>Gem fil som</translation> </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>Advarsel</translation> </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>Gem eller fortryd venligst det aktuelle dyk før du åbner en ny fil</translation> </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>UDDF filer (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="395"/> - <source>Yearly Statistics</source> + <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="871"/> + <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>Årlig Statistik</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="944"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> </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"/> + <translation>Åben dykker log fil</translation> </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"/> + <translation>Dykker log filer (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Filer (*.xml);;UDDF/UDCF Filer(*.uddf *.udcf);;JDive Log Filer(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;Alle Filer(*)</translation> </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"/> + <translation>Færdiggør denne rettelse inden du starter på en ny.</translation> </message> </context> <context> @@ -1792,185 +1838,200 @@ slet dem venligst først.</translation> <message> <location filename="../qt-ui/preferences.ui" line="237"/> <source>Animations</source> - <translation type="unfinished"/> + <translation>Animationer</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="243"/> <source>Speed</source> + <translation>Hastighed</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="289"/> + <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>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Metrisk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Personliggør</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>fod</translation> </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>liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>cu ft</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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"/> + <translation>Grænse ved visning af pO2</translation> </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"/> + <translation>Grænse ved visning af pN2</translation> </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"/> + <translation>Grænse ved visning af pHe</translation> </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"/> + <translation>max ppO2 ved visning af MOD</translation> </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"/> + <translation>Tegn dykkercomputeres rapporterede loft rødt</translation> </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>System Standard</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Tryk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Volumen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Vægt</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>Tids enheder</translation> </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>Vis op- og nedstignings hastighed i</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Minutter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Sekunder</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Vis</translation> </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>GFLow på max dybde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Blandet</translation> </message> @@ -1980,32 +2041,32 @@ slet dem venligst først.</translation> <translation>Indstillinger</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GFlow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GFHøj</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>Genstart nødvendigt</translation> </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>Valg af nyt sprog vil kræve en genstart af Subsurface</translation> </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>Åben standard log fil</translation> </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>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> </message> @@ -2013,22 +2074,17 @@ slet dem venligst først.</translation> <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>&Vis Udskrift</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>U&dskriv</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>&Luk</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Udskriv:</translation> </message> @@ -2154,72 +2210,72 @@ slet dem venligst først.</translation> <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>Ukendt</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>Dyk #%1 - %2</translation> </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>Max dybde: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Varighed: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Gas brugt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>Vægt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Noter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Makker:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Dragt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Sigt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> @@ -2227,40 +2283,75 @@ slet dem venligst først.</translation> <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>Tilføj gas skift</translation> </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>Tilføj bogmærke</translation> </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>Fjern hændelse</translation> </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>Skjul tilsvarende hændelser</translation> </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>Vis alle hændelser</translation> </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>LUFT</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>Fjern dette punkt</translation> </message> @@ -2270,35 +2361,35 @@ slet dem venligst først.</translation> <translation>Luk</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Gennemsnit</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Maksimal</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>Dobbelt klik for at sætte positionen</translation> + <translation>Naviger på kortet og dobbelt klik for at sætte lokationen</translation> </message> </context> <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>Re-nummerer</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>Nyt start nummer</translation> </message> @@ -2306,80 +2397,96 @@ slet dem venligst først.</translation> <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>Skift valgte tider</translation> </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"/> + <translation>Skift tider på billede(r) med</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="99"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="102"/> <source>earlier</source> <translation>Tidligere</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>Senere</translation> </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"/> - <source>Determine camera time offset</source> - <translation type="unfinished"/> + <translation>For at beregne tiden mellem dykkercomputerens ur og dit kameras ud, tag et billede af dykkercomputerens aktuelle tid, indlæs billedet på din computer og klik på denne knap.</translation> </message> <message> <location filename="../qt-ui/shiftimagetimes.ui" line="155"/> + <source>Determine camera time offset</source> + <translation>Beregn kameratid</translation> + </message> + <message> + <location filename="../qt-ui/shiftimagetimes.ui" line="158"/> <source>Select image of divecomputer showing time</source> - <translation type="unfinished"/> + <translation>Vælg billede af dykkercomputerens ur</translation> </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"/> + <translation>Hvilke dato/tid er vist på billedet?</translation> </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"/> + <translation>Åben billed fil</translation> </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"/> + <translation>Billed filer (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> </context> <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>Skift valgte tider</translation> </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>Skift tider på valgte dyk</translation> </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>h:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>Tidligere</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>Senere</translation> </message> @@ -2409,48 +2516,48 @@ slet dem venligst først.</translation> <message> <location filename="../qt-ui/about.cpp" line="12"/> <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation type="unfinished"/> + <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></translation> </message> </context> <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>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Forbinder...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>Download færdig</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>Download fejl; %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Forbindelses fejl:</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>Ugyldig bruger id</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>Kan ikke fortolke svar!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Download succes!</translation> </message> @@ -2466,17 +2573,17 @@ slet dem venligst først.</translation> <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>Beskrivelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2489,6 +2596,49 @@ slet dem venligst først.</translation> <translation>Information</translation> </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> @@ -2505,12 +2655,12 @@ slet dem venligst først.</translation> <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>Beskrivelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2544,11 +2694,16 @@ slet dem venligst først.</translation> </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>Password</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Upload</translation> </message> @@ -2566,37 +2721,37 @@ slet dem venligst først.</translation> <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>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Vægt</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>Klik her, vil fjerne dette vægtsystem</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</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>fod</translation> + <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> @@ -2604,79 +2759,79 @@ slet dem venligst først.</translation> <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>År >Måned / Tur</translation> </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>Varighed Ialt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> Gennemsnit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> Kortest</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> Længst</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Dybde (%1) Gennemsnit</translation> </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> Minimum</translation> </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> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Gennemsnit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2686,72 +2841,72 @@ Gennemsnit</translation> <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>fod</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>pund (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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%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> @@ -2783,250 +2938,246 @@ Gennemsnit</translation> <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>Fejl i læsning af '%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>Maksimum antal kolonner i CSV import er %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>Ingen</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>deco stop</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>opstigning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>Loft</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>Arbejdsbyrde</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>Sender</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>Overtrædelse</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>bogmærke</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>overflade</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>sikkerhedsstop</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>gasskifte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>Sikkerhedsstop (frivillig)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>Sikkerhedsstop (Krævet)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>dybe stop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>Loft (sikkerhedsstop)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>dykketid</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>Under gulv</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Maks. dybde</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>Lufttid</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>Overskrift</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Vævs advarsel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> - <translation>non stop tid</translation> + <translation>non stop time</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>Ugyldigt hændelses nummer</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>Kan ikke oprette parser for %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Fejl i registrering af data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Fejl ved fortolkning af dato/tid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Dyk %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>Fejl i fortolkning af dykkertid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Fejl i fortolkning af max dybde</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Fejl i fortolkning af antallet af gasser</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Fejl i læsning af saltindhold i vandet</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Fejl ved at opnå overflade tryk</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Fejl i fortolkning af gas blanding</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Fejl i fortolkning af prøver</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Event: waiting for user action</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%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>Fejl: registering the event handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Fejl: registering the cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Import fejl i dykker data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>Kan ikke danne libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Kan ikke åbne %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> Mærkelig procent læsning %s @@ -3034,85 +3185,83 @@ Gennemsnit</translation> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Kunne ikke fortolke '%s'. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Fejl i fortolkning af '%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>Database forespørgsel get_events fejlede </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"/> + <translation>Database query get_tags failed. +</translation> </message> <message> - <location filename="../file.c" line="176"/> + <location filename="../file.c" line="166"/> <source>Database connection failed '%s'. </source> <translation>Database forbindelse fejlede '%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>Database forespørgsel fejlede '%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"/> + <translation>Database query get_cylinders failed. +</translation> </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"/> + <translation>Database query get_changes failed. +</translation> </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"/> + <translation>Database query get_profile_sample failed. +</translation> </message> <message> - <location filename="../parse-xml.c" line="2102"/> + <location filename="../parse-xml.c" line="2103"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åbne stylesheet %s</translation> </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>Kan ikke finde gas %d/%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>For mange gas blandinger</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 @@ -3125,35 +3274,35 @@ baseret på GFlow = %.0f og 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>Skift til %.*f %s om %d:%02d min - runtime %d:%02u on %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>Stop på %.*f %s i %d:%02d min - runtime %d:%02u i %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Skift gas til %s⏎ </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Gasforbrug: </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⏎ @@ -3161,323 +3310,351 @@ baseret på GFlow = %.0f og GFhigh = %.0f⏎ </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"/> + <translation>@: %d:%02d +D: %.1f%s + +</translation> </message> <message> - <location filename="../profile.c" line="1234"/> + <location filename="../profile.c" line="1229"/> <source>P: %d%s </source> - <translation type="unfinished"/> + <translation>P: %d%s + +</translation> </message> <message> - <location filename="../profile.c" line="1238"/> + <location filename="../profile.c" line="1233"/> <source>T: %.1f%s </source> - <translation type="unfinished"/> + <translation>T: %.1f%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1239"/> + <source>V: %.1f%s +</source> + <translation>V: %.1f%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1242"/> + <source>SAC: %2.1fl/min +</source> + <translation>SAC: %2.1fl/min +</translation> </message> <message> <location filename="../profile.c" line="1244"/> - <source>V: %.1f%s -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1247"/> - <source>SAC: %2.1fl/min -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1249"/> <source>CNS: %u%% </source> - <translation type="unfinished"/> + <translation>CNS: %u%% +</translation> </message> <message> - <location filename="../profile.c" line="1251"/> + <location filename="../profile.c" line="1246"/> <source>pO%s: %.2fbar </source> - <translation type="unfinished"/> + <translation>pO%s: %.2fbar +</translation> + </message> + <message> + <location filename="../profile.c" line="1248"/> + <source>pN%s: %.2fbar +</source> + <translation>pN%s: %.2fbar +</translation> + </message> + <message> + <location filename="../profile.c" line="1250"/> + <source>pHe: %.2fbar +</source> + <translation>pHe: %.2fbar +</translation> </message> <message> <location filename="../profile.c" line="1253"/> - <source>pN%s: %.2fbar -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1255"/> - <source>pHe: %.2fbar -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1258"/> <source>MOD: %d%s </source> - <translation type="unfinished"/> + <translation>MOD: %d%s +</translation> </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"/> - <source>Safetystop: %umin @ %.0f%s + <location filename="../profile.c" line="1264"/> + <source>END: %d%s +EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1274"/> - <source>Safetystop: unkn time @ %.0f%s + <location filename="../profile.c" line="1276"/> + <source>Safetystop: %umin @ %.0f%s </source> - <translation type="unfinished"/> + <translation>Sikkerhedsstop: %umin @ %.0f%s +</translation> </message> <message> <location filename="../profile.c" line="1279"/> + <source>Safetystop: unkn time @ %.0f%s +</source> + <translation>Sikkerhedsstop: ukendt tid @ %.0f%s</translation> + </message> + <message> + <location filename="../profile.c" line="1284"/> <source>Deco: %umin @ %.0f%s </source> - <translation type="unfinished"/> + <translation>Deko: %umin @ %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1282"/> + <location filename="../profile.c" line="1287"/> <source>Deco: unkn time @ %.0f%s </source> - <translation type="unfinished"/> + <translation>Deko: unkn time @ %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1286"/> + <location filename="../profile.c" line="1291"/> <source>In deco </source> - <translation type="unfinished"/> + <translation>I deko +</translation> </message> <message> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1293"/> <source>NDL: %umin </source> - <translation type="unfinished"/> + <translation>NDL: %umin +</translation> </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"/> - <source>In deco (calc) -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1302"/> - <source>NDL: %umin (calc) -</source> - <translation type="unfinished"/> + <translation>Deko: %umin @ %.0f%s (calc)</translation> </message> <message> <location filename="../profile.c" line="1305"/> + <source>In deco (calc) +</source> + <translation>In deko (beregn)</translation> + </message> + <message> + <location filename="../profile.c" line="1307"/> + <source>NDL: %umin (calc) +</source> + <translation>NDL: %umin (beregn)</translation> + </message> + <message> + <location filename="../profile.c" line="1310"/> <source>TTS: %umin (calc) </source> - <translation type="unfinished"/> + <translation>TTS: %umin (beregn)</translation> </message> <message> - <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1313"/> <source>Calculated ceiling %.0f%s </source> - <translation type="unfinished"/> + <translation>Beregnet loft %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1314"/> + <location filename="../profile.c" line="1319"/> <source>Tissue %.0fmin: %.0f%s </source> - <translation type="unfinished"/> + <translation>Væv %.0fmin: %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1320"/> + <location filename="../profile.c" line="1325"/> <source>heartbeat: %d </source> - <translation type="unfinished"/> + <translation>Hjertefrekvens: %d +</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1327"/> <source>bearing: %d </source> - <translation type="unfinished"/> + <translation>bærende: %d +</translation> </message> <message> - <location filename="../profile.c" line="1414"/> + <location filename="../profile.c" line="1419"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </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>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s </translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 dyk)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 dyk)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>Båd</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>Kyst</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>Strøm</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>dybde</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>hule</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>is</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>vrag</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>grotte</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>Højde</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>svømmehal</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>sø</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>flod</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>nat</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>Fersk</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>Elev</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>foto</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>Instruktør</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>deco</translation> </message> @@ -3527,97 +3704,97 @@ EADD: %d%s <translation>(ingen dyk)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>Søn</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Man</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Tir</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>Ons</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Tor</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Fre</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>Lør</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Mar</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>Maj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Dec</translation> </message> diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts index 9381eae75..a838cffeb 100644 --- a/translations/subsurface_de_CH.ts +++ b/translations/subsurface_de_CH.ts @@ -37,37 +37,42 @@ <translation>O</translation> </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>Hier klicken entfernt diese Flasche.</translation> </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>Flasche kann nicht entfernt werden</translation> </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>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</translation> </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>Tauchcomputer Bezeichnung bearbeiten</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>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>Gerätebezeichnung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Gerätename</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>Hier klicken entfernt diesen Tauchcomputer.</translation> </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>Luft</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>EAN%1</translation> </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>Notausstieg mit offenem System</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> Anfang</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> Ende</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>Luft</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>EAN%1</translation> </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> l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation> cuft/min</translation> </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>Suchfeld anzeigen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>Alle ausklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>Alle einklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>Andere einklappen</translation> </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>Entferne Tauchgang aus Reise</translation> </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>Neue Reise darüber einfügen</translation> </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>Tauchgäng(e) zur Reise darüber hinzufügen</translation> </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>Reise mit Reise darüber verbinden</translation> </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>Reise mit Reise darunter verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>Tauchgang löschen</translation> </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>Tauchgang(gänge) als ungültig kennzeichnen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>Speichern unter</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>Als UDDF exportieren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>Zeiten verschieben</translation> </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"/> + <translation>lade Bilder</translation> </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>Tauchgang(gänge) auf divelogs.de hochladen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>Speichere Tauchgänge als...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Datei speichern als</translation> </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>UDDF Dateien (*.uddf *.UDDF)</translation> </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"/> + <translation>Öffne Bilddateien</translation> </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"/> + <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="760"/> <source>merge selected dives</source> <translation>Ausgewählte Tauchgänge zusammenführen</translation> </message> @@ -288,17 +298,17 @@ <message> <location filename="../qt-ui/divelogimportdialog.ui" line="14"/> <source>Import dive log file</source> - <translation type="unfinished"/> + <translation>Importiere Tauchlog Datei</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="36"/> <source>Import CSV Dive Log Files</source> - <translation type="unfinished"/> + <translation>Importiere CSV Tauchlog Datei</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="50"/> <source>CSV options</source> - <translation type="unfinished"/> + <translation>CSV Optionen</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="62"/> @@ -369,12 +379,12 @@ <message> <location filename="../qt-ui/divelogimportdialog.ui" line="278"/> <source>Manual dives</source> - <translation type="unfinished"/> + <translation>Manuelle Tauchgänge</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="302"/> <source>Dive #</source> - <translation type="unfinished"/> + <translation>Tauchgang Nr.</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="315"/> @@ -399,17 +409,17 @@ <message> <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> <source>Gps</source> - <translation type="unfinished"/> + <translation>GPS</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="393"/> <source>Max depth</source> - <translation type="unfinished"/> + <translation>Max. Tiefe</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="406"/> <source>Mean depth</source> - <translation type="unfinished"/> + <translation>Mittlere Tiefe</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="419"/> @@ -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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Problematische Position des Knotens</translation> </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>Einer oder mehrere Deiner Stopps werden hierdurch verloren gehen. @@ -493,37 +503,42 @@ Bitte entferne diese zuerst.</translation> <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>Luft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Endtiefe</translation> </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>Dauer</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Gasverbrauch</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation>Plan verwerfen?</translation> </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>Du bist dabei Deinen Plan zu verwerfen.</translation> </message> @@ -531,17 +546,17 @@ Bitte entferne diese zuerst.</translation> <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>Planerpunkte</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>Verfügbare Gase</translation> </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>Datenpunkt hinzufügen</translation> </message> @@ -549,140 +564,140 @@ Bitte entferne diese zuerst.</translation> <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>Tiefe</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>Zeit</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>Druck</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>Temperatur</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"/> + <translation>Farbe</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <source>User Entered</source> + <translation>Benutzer Eingabe</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> - <source>User Entered</source> - <translation type="unfinished"/> + <source>Cylinder Index</source> + <translation>Flaschen Index</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> - <source>Cylinder Index</source> - <translation type="unfinished"/> + <source>Pressure S</source> + <translation>Druck S</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> - <source>Pressure S</source> - <translation type="unfinished"/> + <source>Pressure I</source> + <translation>Druck I</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> - <source>Pressure I</source> - <translation type="unfinished"/> + <source>Ceiling</source> + <translation>tiefster Deko-Stopp</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> - <source>Ceiling</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <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"/> + <translation>pN₂</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <source>PHE</source> + <translation>pHe</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> - <source>PHE</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>PO2</source> - <translation>PO₂</translation> + <translation>pO₂</translation> </message> </context> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1288"/> + <location filename="../qt-ui/models.cpp" line="1305"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1291"/> + <location filename="../qt-ui/models.cpp" line="1308"/> <source>date</source> <translation>Datum</translation> </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>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1309"/> + <location filename="../qt-ui/models.cpp" line="1326"/> <source>suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>Tauchplatz</translation> </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>max. CNS</translation> </message> @@ -690,115 +705,115 @@ Bitte entferne diese zuerst.</translation> <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>Ungültige Serverantwort</translation> </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>%1 anstelle des erwarteten XML Tags 'DiveDateReader'.</translation> </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>XML Tag 'DiveDates' nicht gefunden.</translation> </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>Ungültige XML Antwort. Zeile %1: %2</translation> </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>keine Tauchgänge ausgewählt</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> - <translation>konnte keine zip Datei für die Übertragung erstellen: %1</translation> + <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> - <translation>kann keine temporäre Datei erstellen: %1</translation> + <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> - <translation>Interner Fehler: %1</translation> + <source>internal error: %s</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> <source>internal error</source> - <translation>Interner Fehler</translation> + <translation>ein interner Fehler ist aufgetreten</translation> </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>Fertig</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>Übertrage Liste der Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>Liste der Tauchgänge herunterladen...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>Lade %1 Tauchgänge vom Server...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>Herunterladen beendet - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Heruntergeladene Daten sind beschädigt.</translation> </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>Das Archiv konnte nicht geöffnet werden %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>Übertragung fehlgeschlagen</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Übertragung erfolgreich</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>Login fehlgeschlagen</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>Verstehe die Antwort nicht</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Fehler: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Übertragung beendet</translation> </message> @@ -825,7 +840,7 @@ Bitte entferne diese zuerst.</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/> <source>Find Uemis dive computer</source> - <translation type="unfinished"/> + <translation>Finde Uemis Tauchcomputer</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/> @@ -921,7 +936,7 @@ Bitte entferne diese zuerst.</translation> <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>Ausgewählte Tauchplätze bearbeiten</translation> </message> @@ -930,13 +945,13 @@ Bitte entferne diese zuerst.</translation> <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>Notizen</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>Ort</translation> </message> @@ -962,13 +977,13 @@ Bitte entferne diese zuerst.</translation> </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>Lufttemperatur</translation> </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>Wassertemperatur</translation> </message> @@ -994,7 +1009,7 @@ Bitte entferne diese zuerst.</translation> </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>Notizen</translation> </message> @@ -1125,13 +1140,13 @@ Bitte entferne diese zuerst.</translation> <translation>Gewichtsystem hinzufügen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Ziel der Reise</translation> </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>Reisenotizen</translation> </message> @@ -1145,62 +1160,62 @@ Bitte entferne diese zuerst.</translation> <source>Cancel</source> <translation>Abbrechen</translation> </message> - <message> - <location filename="../qt-ui/maintab.cpp" line="232"/> - <source>Air temp [%1]</source> - <translation type="unfinished"/> - </message> <message> <location filename="../qt-ui/maintab.cpp" line="233"/> - <source>Water temp [%1]</source> - <translation type="unfinished"/> + <source>Air temp [%1]</source> + <translation>Lufttemperatur [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="234"/> + <source>Water temp [%1]</source> + <translation>Wassertemperatur [%1]</translation> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>This trip is being edited.</source> <translation>Diese Reise wird bearbeitet.</translation> </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>Mehrere Tauchgänge werden bearbeitet.</translation> </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>Dieser Tauchgang wird bearbeitet.</translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>unbekannt</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>O</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> @@ -1208,256 +1223,276 @@ Bitte entferne diese zuerst.</translation> <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>Filter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>&Datei</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>&Ansicht</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>&Hilfe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>&Importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>&Neues Logbuch</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Neu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>Logbuch &öffnen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Öffnen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>&Speichern</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Speichern unter</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>Ctrl+Shift+S</translation> </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>Schliessen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>Exportiere &UDDF</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="138"/> <source>Enable the pN2 Graph</source> - <translation type="unfinished"/> + <translation>Blende pN₂ Kurve ein</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="164"/> <source>Enable the pHe graph</source> - <translation type="unfinished"/> + <translation>Blende pHe Kurve ein</translation> </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>EAD, END, EADD anzeigen</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Show NDL / TTS</source> - <translation type="unfinished"/> + <translation>Zeige NTL / TTS</translation> </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"/> + <translation>Tiefenachse neu skalieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="681"/> + <location filename="../qt-ui/mainwindow.ui" line="709"/> <source>Ctrl+U</source> <translation>Ctrl+U</translation> </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>&Drucken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>&Beenden</translation> </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>Von &Tauchcomputer importieren</translation> </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>&GPS Daten vom Subsurface Service importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>Gerätenamen &bearbeiten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>&Neu nummerieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>&Jahresstatistiken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Tauchgangliste</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Informationen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>&Bedienungsanleitung</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Globus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>Tauchgang p&lanen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>von Divelogs.de importieren</translation> </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>Ctrl+P</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="112"/> <source>Enable the pO2 Graph</source> - <translation type="unfinished"/> + <translation>Blende pO2 Kurve ein</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="115"/> @@ -1473,252 +1508,263 @@ Bitte entferne diese zuerst.</translation> <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>...</translation> </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"/> + <translation>MOD einschalten</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="193"/> <source>Show the DC Reported Ceiling</source> - <translation type="unfinished"/> + <translation>Vom TC ausgelesene tiefste Deko-Stopps anzeigen</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="222"/> <source>Show the Calculated Ceiling</source> - <translation type="unfinished"/> + <translation>Berechnete tiefste Deko-Stopps anzeigen</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="274"/> <source>Show Calculated Ceiling with 3m Increments</source> - <translation type="unfinished"/> + <translation>Berechnete tiefste Deko-Stopps in 3m Schritten anzeigen</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="248"/> <source>Calculate All Tissues</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.ui" line="378"/> - <source>Show SAC Rate</source> - <translation type="unfinished"/> + <translation>Berechne alle Gewebe</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="404"/> - <source>Enable / Disable the Ruler</source> - <translation type="unfinished"/> + <source>Show SAC Rate</source> + <translation>Zeige SAC Rate</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="430"/> + <source>Enable / Disable the Ruler</source> + <translation>Lineal Ein-/Ausblenden</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Preferences</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Tauchgang hinzufügen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Automatisch gruppieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>Vorh. TC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Links</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>Nächster TC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Rechts</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Ereignisse auswählen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Plan eingeben</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>Über Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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"/> + <translation>Importiere Log-Dateien</translation> </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"/> + <translation>Importiere Tauchlogdateien aus anderen Anwendungen</translation> </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"/> + <translation>&Vollbild</translation> </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"/> + <translation>Vollbild Umschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="884"/> + <location filename="../qt-ui/mainwindow.ui" line="920"/> <source>F11</source> - <translation type="unfinished"/> + <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="143"/> + <location filename="../qt-ui/mainwindow.cpp" line="173"/> <source>Open File</source> <translation>Datei öffnen</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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor das Logbuch geschlossen werden kann.</translation> </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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchplan bearbeitet werden kann.</translation> </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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchgang hinzugefügt werden kann.</translation> </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>Möchtest Du die Änderungen in der Datei %1 speichern?</translation> </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>Möchtest Du die Änderungen in der Daten-Datei speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Änderungen speichern?</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>Änderungen gehen verloren wenn Du sie nicht speicherst.</translation> </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>Datei speichern unter</translation> </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>Warnung</translation> </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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neues Logbuch geöffnet werden kann.</translation> </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>UDDF Dateien (*.uddf *.UDDF)</translation> </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>Jahresstatistiken</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>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> </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"/> + <translation>Öffne Tauchlog Datei</translation> </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"/> + <translation>Tauchlog Dateien (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Dateien (*.xml);;UDDF/UDCF Dateien(*.uddf *.udcf);;JDiveLog Dateien(*.jlb);;Suunto Dateien(*.sde *.db);;CSV Files(*.csv);;Alle Dateien(*)</translation> </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"/> + <translation>Bitte zuerst die aktuelle Bearbeitung abschliessen um eine Neue zu beginnen.</translation> </message> </context> <context> @@ -1791,185 +1837,200 @@ Bitte entferne diese zuerst.</translation> <message> <location filename="../qt-ui/preferences.ui" line="237"/> <source>Animations</source> - <translation type="unfinished"/> + <translation>Animationen</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="243"/> <source>Speed</source> + <translation>Geschwindigkeit</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="289"/> + <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>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Metrisch</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Zöllig</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> - <translation>Personalisiert</translation> + <translation>Personalisieren</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>Meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>Fuss</translation> </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>Liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>cu ft</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>Celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>Fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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"/> + <translation>Schwellenwert bei pO₂ Anzeige</translation> </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"/> + <translation>Schwellenwert bei pN₂ Anzeige</translation> </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"/> + <translation>Schwellenwert bei pHe Anzeige</translation> </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"/> + <translation>max ppO₂ bei MOD Anzeige</translation> </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"/> + <translation>Zeichne Auftauchgrenze des Tauchcomputers in rot</translation> </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>Systemeinstellung</translation> + <translation>Systemeinstellungen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Druck</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Volumen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="465"/> + <location filename="../qt-ui/preferences.ui" line="492"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="507"/> <source>Time units</source> <translation>Zeiteinheiten</translation> </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>Zeiteinheit für Geschwindigkeit bei Aufstieg/Abstieg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Minuten</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Sekunden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Anzeigen</translation> </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>GF low bei maximaler Tiefe anwenden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Sonstiges</translation> </message> @@ -1979,32 +2040,32 @@ Bitte entferne diese zuerst.</translation> <translation>Einstellungen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GF low</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GF high</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>Bitte Programm neu starten</translation> </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>Um die neue Sprache laden zu können, muss Subsurface neu gestartet werden.</translation> </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>Standard Logfile öffnen</translation> </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>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> </message> @@ -2012,22 +2073,17 @@ Bitte entferne diese zuerst.</translation> <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>Vorschau</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>Drucken</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>Schliessen</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Drucken</translation> </message> @@ -2153,72 +2209,72 @@ Bitte entferne diese zuerst.</translation> <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>unbekannt</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>Tauchgang Nr %1 - %2</translation> </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>max Tiefe: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Dauer: %1 Minuten</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Verw. Gas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>Blei:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Notizen:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Anzug:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Sicht:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Bewertung:</translation> </message> @@ -2226,40 +2282,75 @@ Bitte entferne diese zuerst.</translation> <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>Gaswechsel setzen</translation> </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>Markierung setzen</translation> </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>Entferne Ereigniss</translation> </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>Ähnliche Ereignisse ausblenden</translation> </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>Alle Ereignisse einblenden</translation> </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>Luft</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>Diesen Punkt entfernen</translation> </message> @@ -2269,22 +2360,22 @@ Bitte entferne diese zuerst.</translation> <translation>Schliessen</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Ø</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Min.</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Max.</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>Karte verschieben und mit Doppelklick Tauchplatz markieren</translation> </message> @@ -2292,12 +2383,12 @@ Bitte entferne diese zuerst.</translation> <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>Neu nummerieren</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>Neue erste Nummer</translation> </message> @@ -2305,80 +2396,96 @@ Bitte entferne diese zuerst.</translation> <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>Ausgewählte Zeiten verschieben</translation> </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"/> + <translation>Ausgewählte Zeiten von Bild(ern) verschieben um...</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="99"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="102"/> <source>earlier</source> <translation>früher</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>später</translation> </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"/> - <source>Determine camera time offset</source> - <translation type="unfinished"/> + <translation>Um den Zeitversatz zwischen der Uhrzeit des Tauchcomputers und der Kamera zu berechnen machen sie einfach ein Bild ihres Tauchcomputers mit der Kamera. Laden sie dieses Bild in den Computer und drücken diesen Knopf.</translation> </message> <message> <location filename="../qt-ui/shiftimagetimes.ui" line="155"/> + <source>Determine camera time offset</source> + <translation>Versatz der Kamerazeit festlegen</translation> + </message> + <message> + <location filename="../qt-ui/shiftimagetimes.ui" line="158"/> <source>Select image of divecomputer showing time</source> - <translation type="unfinished"/> + <translation>Wähle Bild des Tauchcomputers das die Zeit zeigt</translation> </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"/> + <translation>Welche/s Datum/Zeit werden im Bild angezeigt?</translation> </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"/> + <translation>Öffne Bilddateien</translation> </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"/> + <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> </context> <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>Ausgewählte Zeiten verschieben</translation> </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>Ausgewählte Zeiten verschieben um...</translation> </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>h:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>früher</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>später</translation> </message> @@ -2408,48 +2515,48 @@ Bitte entferne diese zuerst.</translation> <message> <location filename="../qt-ui/about.cpp" line="12"/> <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation type="unfinished"/> + <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-Plattform Tauchlog Software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, und andere, 2011-2014</span></translation> </message> </context> <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>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Verbinde...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>Herunterladen beendet</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>Fehler beim Herunterladen: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Verbindungsfehler: </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>Ungültige Benutzerkennung</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>Verstehe die Antwort nicht!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Erfolgreich geladen!</translation> </message> @@ -2465,17 +2572,17 @@ Bitte entferne diese zuerst.</translation> <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>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2488,6 +2595,49 @@ Bitte entferne diese zuerst.</translation> <translation>Information</translation> </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> @@ -2504,12 +2654,12 @@ Bitte entferne diese zuerst.</translation> <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>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2529,7 +2679,7 @@ Bitte entferne diese zuerst.</translation> <message> <location filename="../qt-ui/webservices.ui" line="32"/> <source>Enter your ID here</source> - <translation>ID eingeben</translation> + <translation>Hier ID eingeben</translation> </message> <message> <location filename="../qt-ui/webservices.ui" line="44"/> @@ -2543,11 +2693,16 @@ Bitte entferne diese zuerst.</translation> </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>Passwort</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Hochladen</translation> </message> @@ -2565,37 +2720,37 @@ Bitte entferne diese zuerst.</translation> <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>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Gewicht</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>Hier klicken entfernt dieses Gewichtssystem.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="442"/> + <location filename="../qt-ui/models.cpp" line="454"/> <source>lbs</source> <translation>US Pfund</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> @@ -2603,79 +2758,79 @@ Bitte entferne diese zuerst.</translation> <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>Jahr > Monat / Reise</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1659"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1662"/> <source>Duration Total</source> <translation>Dauer Gesamt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> Ø</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> Kürzester</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> Längster</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Tiefe (%1) Durchschnitt</translation> </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> Minimum</translation> </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> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Durchschnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2685,72 +2840,72 @@ Mittel</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="57"/> + <location filename="../dive.c" line="58"/> <source>pascal</source> <translation>Pa</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>US Pfund</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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) oder (%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> @@ -2782,250 +2937,246 @@ Mittel</translation> <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>Fehler beim Lesen von '%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>maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>keine</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>Deko-Stopp</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>Aufstieg</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>tiefster Deko-Stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>Arbeit</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>Sender</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>Verletzung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>Markierung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>Oberfläche</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>Sicherheitsstopp</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>Gaswechsel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>Sicherheitsstopp (freiwillig)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>Sicherheitsstopp (obligatorisch)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>Tiefen-Stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>Sicherheits-Stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>Tauchgangsdauer</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>unterhalb Dekotiefe</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Max. Tiefe</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>PO₂</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>verbleibende Atemzeit</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>Richtung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Gewebewarnung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>Nullzeit</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>ungültige Ereignisnummer</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>Nicht in der Lage, einen Parser für %s %s zu erstellen</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Fehler beim Registrieren der Daten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Fehler beim Lesen des Datums</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Tauchgang Nr. %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>Fehler beim Lesen der Dauer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Fehler beim Lesen der maximalen Tiefe</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Fehler beim Lesen der Gasgemischszahl</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Fehler beim Lesen des Salzgehalts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Kein Oberflächendruck erhalten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Fehler beim Lesen der Gasgemischs</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Fehler beim Lesen der Samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Ereignis: warte auf Benutzeraktion</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%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>Fehler beim Registrieren der Ereignisbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Fehler beim Importieren der Tauchgangsdaten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Fehler beim Öffnen von %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>Unverständliche Prozentangabe %s @@ -3033,85 +3184,83 @@ Mittel</translation> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Fehler beim Lesen von '%s'. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Fehler beim Lesen von '%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>Datenbank Anfrage 'get_events' fehlgeschlagen. </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"/> + <translation>Datenbank Anfrage 'get_tags' fehlgeschlagen. +</translation> </message> <message> - <location filename="../file.c" line="176"/> + <location filename="../file.c" line="166"/> <source>Database connection failed '%s'. </source> <translation>Datenbank Verbindung fehlgeschlagen '%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>Datenbank Anfrage fehlgeschlagen '%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"/> + <translation>Datenbank Anfrage 'get_cylinders' fehlgeschlagen. +</translation> </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"/> + <translation>Datenbank Anfrage 'get_changes' fehlgeschlagen. +</translation> </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"/> + <translation>Datenbank Anfrage 'get_profile_sample' fehlgeschlagen. +</translation> </message> <message> - <location filename="../parse-xml.c" line="2102"/> + <location filename="../parse-xml.c" line="2103"/> <source>Can't open stylesheet %s</source> <translation>Kann Stylesheet %s nicht öffnen</translation> </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>Kann Gasgemisch %d/%d nicht finden</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>Zu viele Gasgemische</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 @@ -3124,357 +3273,388 @@ basierend auf GFlow = %.0f und 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>Tauchen auf %.*f %s in %d:%02d min - Gesamtzeit %d:%02u mit %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>Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Gaswechsel zu %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Gasverbrauch: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f%s %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"/> + <translation>@: %d:%02d +D: %.1f%s +</translation> </message> <message> - <location filename="../profile.c" line="1234"/> + <location filename="../profile.c" line="1229"/> <source>P: %d%s </source> - <translation type="unfinished"/> + <translation>P: %d%s +</translation> </message> <message> - <location filename="../profile.c" line="1238"/> + <location filename="../profile.c" line="1233"/> <source>T: %.1f%s </source> - <translation type="unfinished"/> + <translation>T: %.1f%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1239"/> + <source>V: %.1f%s +</source> + <translation>V: %.1f%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1242"/> + <source>SAC: %2.1fl/min +</source> + <translation>SAC: %2.1fl/min +</translation> </message> <message> <location filename="../profile.c" line="1244"/> - <source>V: %.1f%s -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1247"/> - <source>SAC: %2.1fl/min -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1249"/> <source>CNS: %u%% </source> - <translation type="unfinished"/> + <translation>CNS: %u%% +</translation> </message> <message> - <location filename="../profile.c" line="1251"/> + <location filename="../profile.c" line="1246"/> <source>pO%s: %.2fbar </source> - <translation type="unfinished"/> + <translation>pO%s: %.2fbar +</translation> + </message> + <message> + <location filename="../profile.c" line="1248"/> + <source>pN%s: %.2fbar +</source> + <translation>pN%s: %.2fbar +</translation> + </message> + <message> + <location filename="../profile.c" line="1250"/> + <source>pHe: %.2fbar +</source> + <translation>pHe: %.2fbar +</translation> </message> <message> <location filename="../profile.c" line="1253"/> - <source>pN%s: %.2fbar -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1255"/> - <source>pHe: %.2fbar -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1258"/> <source>MOD: %d%s </source> - <translation type="unfinished"/> + <translation>MOD: %d%s +</translation> </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"/> - <source>Safetystop: %umin @ %.0f%s + <location filename="../profile.c" line="1264"/> + <source>END: %d%s +EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1274"/> - <source>Safetystop: unkn time @ %.0f%s + <location filename="../profile.c" line="1276"/> + <source>Safetystop: %umin @ %.0f%s </source> - <translation type="unfinished"/> + <translation>Sicherheitsstop: %umin @ %.0f%s +</translation> </message> <message> <location filename="../profile.c" line="1279"/> + <source>Safetystop: unkn time @ %.0f%s +</source> + <translation>Sicherheitsstop: unbek. Zeit @ %.0f%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1284"/> <source>Deco: %umin @ %.0f%s </source> - <translation type="unfinished"/> + <translation>Deko: %umin @ %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1282"/> + <location filename="../profile.c" line="1287"/> <source>Deco: unkn time @ %.0f%s </source> - <translation type="unfinished"/> + <translation>Deko: unbek. Zeit @ %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1286"/> + <location filename="../profile.c" line="1291"/> <source>In deco </source> - <translation type="unfinished"/> + <translation>In Deko +</translation> </message> <message> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1293"/> <source>NDL: %umin </source> - <translation type="unfinished"/> + <translation>NDL: %umin +</translation> </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"/> - <source>In deco (calc) -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1302"/> - <source>NDL: %umin (calc) -</source> - <translation type="unfinished"/> + <translation>Deko: %umin @ %.0f%s (berechnet) +</translation> </message> <message> <location filename="../profile.c" line="1305"/> + <source>In deco (calc) +</source> + <translation>Deko (berechnet) +</translation> + </message> + <message> + <location filename="../profile.c" line="1307"/> + <source>NDL: %umin (calc) +</source> + <translation>NDL: %umin (berechnet) +</translation> + </message> + <message> + <location filename="../profile.c" line="1310"/> <source>TTS: %umin (calc) </source> - <translation type="unfinished"/> + <translation>TTS: %umin (berechnet) +</translation> </message> <message> - <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1313"/> <source>Calculated ceiling %.0f%s </source> - <translation type="unfinished"/> + <translation>Berechneter tiefster Deko-Stopp %.0f %s +</translation> </message> <message> - <location filename="../profile.c" line="1314"/> + <location filename="../profile.c" line="1319"/> <source>Tissue %.0fmin: %.0f%s </source> - <translation type="unfinished"/> + <translation>Gewebe %.0fmin: %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1320"/> + <location filename="../profile.c" line="1325"/> <source>heartbeat: %d </source> - <translation type="unfinished"/> + <translation>Herzschlag: %d +</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1327"/> <source>bearing: %d </source> - <translation type="unfinished"/> + <translation>Peilung: %d +</translation> </message> <message> - <location filename="../profile.c" line="1414"/> + <location filename="../profile.c" line="1419"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </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>%s %sTiefe:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sTiefe:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sDruck:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 Tauchgänge)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 Tauchgang)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>Boot</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>Ufer</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>Strömung</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>tief</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>Kaverne</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>Eis</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>Wrack</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>Höhle</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>Berg</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>Pool</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>See</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>Fluss</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>Nacht</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>süss</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>Schüler</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>Foto</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>Instruktor</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>deko</translation> </message> @@ -3524,97 +3704,97 @@ EADD: %d%s <translation>(keine Tauchgänge)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>So</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Mo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Di</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>Mi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Do</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Fr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>Sa</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Mär</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>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Dez</translation> </message> diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts index 4036ee3e2..ee9d82b1e 100644 --- a/translations/subsurface_de_DE.ts +++ b/translations/subsurface_de_DE.ts @@ -37,37 +37,42 @@ <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="158"/> + <location filename="../qt-ui/models.cpp" line="71"/> + <source>Switch at</source> + <translation>Wechsel bei</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="162"/> <source>Clicking here will remove this cylinder.</source> <translation>Hier klicken entfernt diese Flasche.</translation> </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>Flasche kann nicht entfernt werden</translation> </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>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</translation> </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>cu.ft.</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>Tauchcomputer Bezeichnung bearbeiten</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>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>Gerätebezeichnung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Gerätename</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>Hier klicken entfernt diesen Tauchcomputer.</translation> </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>Luft</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>EAN%1</translation> </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>Notausstieg mit offenem System</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> Anfang</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> Ende</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>Luft</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>EAN%1</translation> </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>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation>cuft/min</translation> </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>Suchfeld anzeigen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>Alle ausklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>Alle einklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>Andere einklappen</translation> </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>Entferne Tauchgang aus Reise</translation> </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>Neue Reise darüber einfügen</translation> </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>Tauchgäng(e) zur Reise darüber hinzufügen</translation> </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>Tauchgäng(e) zur Reise darunter hinzufügen</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="749"/> <source>merge trip with trip above</source> <translation>Reise mit Reise darüber verbinden</translation> </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>Reise mit Reise darunter verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>Tauchgang löschen</translation> </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>Tauchgang(gänge) als ungültig kennzeichnen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>Speichern unter</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>Als UDDF exportieren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>Zeiten verschieben</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="735"/> + <location filename="../qt-ui/divelistview.cpp" line="765"/> <source>load images</source> <translation>lade Bilder</translation> </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>Tauchgang(gänge) auf divelogs.de hochladen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>Speichere Tauchgänge als...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Datei speichern als</translation> </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>UDDF Dateien (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="801"/> + <location filename="../qt-ui/divelistview.cpp" line="831"/> <source>Open Image Files</source> <translation>Öffne Bilddateien</translation> </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>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="760"/> <source>merge selected dives</source> <translation>Ausgewählte Tauchgänge zusammenführen</translation> </message> @@ -409,7 +419,7 @@ <message> <location filename="../qt-ui/divelogimportdialog.ui" line="406"/> <source>Mean depth</source> - <translation>Min. Tiefe</translation> + <translation>Mittlere Tiefe</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="419"/> @@ -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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Problematische Position des Knotens</translation> </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>Einer oder mehrere Deiner Stopps werden hierdurch verloren gehen. @@ -493,37 +503,42 @@ Bitte entferne diese zuerst.</translation> <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>Luft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Endtiefe</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1087"/> + <location filename="../qt-ui/diveplanner.cpp" line="1154"/> + <source>Run time</source> + <translation>Laufzeit</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="1156"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Gasverbrauch</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation>Plan verwerfen?</translation> </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>Du bist dabei Deinen Plan zu verwerfen.</translation> </message> @@ -531,17 +546,17 @@ Bitte entferne diese zuerst.</translation> <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>Planerpunkte</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>Verfügbare Gase</translation> </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>Datenpunkt hinzufügen</translation> </message> @@ -549,72 +564,72 @@ Bitte entferne diese zuerst.</translation> <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>Tiefe</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>Zeit</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>Druck</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>Temperatur</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>Farbe</translation> </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>Benutzer Eingabe</translation> </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>Flaschen Index</translation> </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>Druck S</translation> </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>Druck I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Ceiling</source> <translation>tiefster Deko-Stopp</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>SAC</source> <translation>AMV</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>PN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>PHE</source> <translation>PHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>PO2</source> <translation>PO₂</translation> </message> @@ -622,67 +637,67 @@ Bitte entferne diese zuerst.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1288"/> + <location filename="../qt-ui/models.cpp" line="1305"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1291"/> + <location filename="../qt-ui/models.cpp" line="1308"/> <source>date</source> <translation>Datum</translation> </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>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1309"/> + <location filename="../qt-ui/models.cpp" line="1326"/> <source>suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>Tauchplatz</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1318"/> + <location filename="../qt-ui/models.cpp" line="1335"/> <source>SAC</source> <translation>AMV</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>max. CNS</translation> </message> @@ -690,44 +705,44 @@ Bitte entferne diese zuerst.</translation> <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>Ungültige Serverantwort</translation> </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>%1 anstelle des erwarteten XML Tags 'DiveDateReader'.</translation> </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>XML Tag 'DiveDates' nicht gefunden.</translation> </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>Ungültige XML Antwort. Zeile %1: %2</translation> </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>keine Tauchgänge ausgewählt</translation> </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>konnte keine zip Datei für die Übertragung erstellen: %1</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/> - <source>cannot create temporary file: %1</source> - <translation>kann keine temporäre Datei erstellen: %1</translation> + <source>cannot create temporary file: %s</source> + <translation>kann keine temporäre Datei erstellen: %s</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/> - <source>internal error: %1</source> - <translation>ein interner Fehler ist aufgetreten: %1</translation> + <source>internal error: %s</source> + <translation>ein Fehler ist aufgetreten: %s</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> @@ -735,70 +750,70 @@ Bitte entferne diese zuerst.</translation> <translation>ein interner Fehler ist aufgetreten</translation> </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>Fertig</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>Übertrage Liste der Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>Liste der Tauchgänge herunterladen...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>Lade %1 Tauchgänge vom Server...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>Herunterladen beendet - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Heruntergeladene Daten sind beschädigt.</translation> </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>Das Archiv konnte nicht geöffnet werden %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>Übertragung fehlgeschlagen</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Übertragung erfolgreich</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>Login fehlgeschlagen</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>Verstehe die Antwort nicht</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Fehler: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Übertragung beendet</translation> </message> @@ -921,7 +936,7 @@ Bitte entferne diese zuerst.</translation> <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>Ausgewählte Tauchplätze bearbeiten</translation> </message> @@ -930,13 +945,13 @@ Bitte entferne diese zuerst.</translation> <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>Notizen</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>Ort</translation> </message> @@ -962,13 +977,13 @@ Bitte entferne diese zuerst.</translation> </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>Lufttemperatur</translation> </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>Wassertemperatur</translation> </message> @@ -994,7 +1009,7 @@ Bitte entferne diese zuerst.</translation> </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>Notizen</translation> </message> @@ -1125,13 +1140,13 @@ Bitte entferne diese zuerst.</translation> <translation>Gewichtsystem hinzufügen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Ziel der Reise</translation> </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>Reisenotizen</translation> </message> @@ -1145,62 +1160,62 @@ Bitte entferne diese zuerst.</translation> <source>Cancel</source> <translation>Abbrechen</translation> </message> - <message> - <location filename="../qt-ui/maintab.cpp" line="232"/> - <source>Air temp [%1]</source> - <translation type="unfinished"/> - </message> <message> <location filename="../qt-ui/maintab.cpp" line="233"/> - <source>Water temp [%1]</source> - <translation type="unfinished"/> + <source>Air temp [%1]</source> + <translation>Lufttemperatur [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="234"/> + <source>Water temp [%1]</source> + <translation>Wassertemperatur [%1]</translation> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>This trip is being edited.</source> <translation>Diese Reise wird bearbeitet.</translation> </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>Mehrere Tauchgänge werden bearbeitet.</translation> </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>Dieser Tauchgang wird bearbeitet.</translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>unbekannt</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>O</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> @@ -1208,249 +1223,269 @@ Bitte entferne diese zuerst.</translation> <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>Filter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>&Datei</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>&Ansicht</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>&Hilfe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>&Importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>&Neues Logbuch</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Neu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Strg+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>Logbuch &öffnen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Öffnen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Strg+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>&Speichern</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Strg+S</translation> </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>Speichern unter</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>Strg+Shift+S</translation> </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>Schließen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Strg+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Strg+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>Exportiere &UDDF</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="138"/> <source>Enable the pN2 Graph</source> - <translation type="unfinished"/> + <translation>Blende pN₂ Kurve ein</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="164"/> <source>Enable the pHe graph</source> - <translation type="unfinished"/> + <translation>Blende pHe Kurve ein</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="326"/> + <location filename="../qt-ui/mainwindow.ui" line="300"/> + <source>Show/hide heart rate</source> + <translation>Pulsrate anzeigen/verbergen</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Enable EAD, END, and EADD</source> <translation>EAD, END, EADD anzeigen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Show NDL / TTS</source> - <translation type="unfinished"/> + <translation>Zeige NTL / TTS</translation> </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"/> + <translation>Tiefenachse neu skalieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="681"/> + <location filename="../qt-ui/mainwindow.ui" line="709"/> <source>Ctrl+U</source> <translation>Strg+U</translation> </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>HTML Weltkarte exportieren</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="717"/> + <source>Ctrl+H</source> + <translation>Ctrl+H</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="722"/> <source>&Print</source> <translation>&Drucken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Strg+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>&Beenden</translation> </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>Von &Tauchcomputer importieren</translation> </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>&GPS Daten vom Subsurface Service importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Strg+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>Gerätenamen &bearbeiten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Strg++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>&Neu nummerieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Strg+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>&Jahresstatistiken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Strg+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Tauchgangliste</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Informationen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>&Bedienungsanleitung</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Globus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>Tauchgang p&lanen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Strg+L</translation> </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>von Divelogs.de importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="689"/> + <location filename="../qt-ui/mainwindow.ui" line="945"/> + <source>&Check for Updates</source> + <translation>Neue Version suchen</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Ctrl+P</source> <translation>Strg+P</translation> </message> @@ -1473,11 +1508,12 @@ Bitte entferne diese zuerst.</translation> <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>...</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="300"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>Enable MOD</source> <translation>MOD einschalten</translation> </message> @@ -1502,221 +1538,231 @@ Bitte entferne diese zuerst.</translation> <translation>Berechne alle Gewebe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="378"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>Show SAC Rate</source> - <translation>Zeige SAC Rate</translation> + <translation>Zeige AMV Rate</translation> </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>Lineal Ein-/Ausblenden</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Preferences</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Strg+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Strg+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Tauchgang hinzufügen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Automatisch gruppieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Strg+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Strg+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Strg+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Strg+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>Vorh. TC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Links</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>Nächster TC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Rechts</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Ereignisse auswählen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Plan eingeben</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>Über Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Strg+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="859"/> + <location filename="../qt-ui/mainwindow.ui" line="895"/> <source>Import Log Files</source> <translation>Importiere Log-Dateien</translation> </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>Importiere Tauchlogdateien aus anderen Anwendungen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="878"/> + <location filename="../qt-ui/mainwindow.ui" line="914"/> <source>&Full Screen</source> <translation>&Vollbild</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="881"/> + <location filename="../qt-ui/mainwindow.ui" line="917"/> <source>Toggle Full Screen</source> <translation>Vollbild Umschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="884"/> + <location filename="../qt-ui/mainwindow.ui" line="920"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="143"/> + <location filename="../qt-ui/mainwindow.cpp" line="173"/> <source>Open File</source> <translation>Datei öffnen</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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor das Logbuch geschlossen werden kann.</translation> </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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchplan bearbeitet werden kann.</translation> </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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchgang hinzugefügt werden kann.</translation> </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>Möchtest Du die Änderungen in der Datei %1 speichern?</translation> </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>Möchtest Du die Änderungen in der Daten-Datei speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Änderungen speichern?</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>Änderungen gehen verloren wenn Du sie nicht speicherst.</translation> </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>Datei speichern unter</translation> </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>Warnung</translation> </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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neues Logbuch geöffnet werden kann.</translation> </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>UDDF Dateien (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="395"/> + <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <source>Export World Map</source> + <translation>Weltkarte exportieren</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="289"/> + <source>HTML files (*.html)</source> + <translation>HTML Dateien (*.html)</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="438"/> <source>Yearly Statistics</source> <translation>Jahresstatistiken</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>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> </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>Öffne Tauchlog Datei</translation> </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>Tauchlog Dateien (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Dateien (*.xml);;UDDF/UDCF Dateien(*.uddf *.udcf);;JDiveLog Dateien(*.jlb);;Suunto Dateien(*.sde *.db);;CSV Files(*.csv);;Alle Dateien(*)</translation> </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>Bitte zuerst die aktuelle Bearbeitung abschliessen um eine Neue zu beginnen.</translation> </message> @@ -1791,185 +1837,200 @@ Bitte entferne diese zuerst.</translation> <message> <location filename="../qt-ui/preferences.ui" line="237"/> <source>Animations</source> - <translation type="unfinished"/> + <translation>Animationen</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="243"/> <source>Speed</source> - <translation type="unfinished"/> + <translation>Geschwindigkeit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="289"/> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> + <translation>Subsurface Webservice</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="276"/> + <source>Default User ID</source> + <translation>Standard Benutzer-Kennung</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="287"/> + <source>Save User ID locally?</source> + <translation>Benutzer-Kennung lokal speichern?</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>System</source> <translation>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Metrisch</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Zöllig</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Personalisieren</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>Meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>Fuß</translation> </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>Liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>cu ft</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>Celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>Fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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>Schwellenwert bei pO₂ Anzeige</translation> </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>Schwellenwert bei pN₂ Anzeige</translation> </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>Schwellenwert bei pHe Anzeige</translation> </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>max ppO₂ bei MOD Anzeige</translation> </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>Zeichne Auftauchgrenze des Tauchcomputers in rot</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="655"/> - <source>unused tanks</source> - <translation>unbenutzte Flaschen</translation> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="723"/> + <location filename="../qt-ui/preferences.ui" line="747"/> <source>System Default</source> <translation>Standardeinstellungen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Druck</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Volumen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="465"/> + <location filename="../qt-ui/preferences.ui" line="492"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="507"/> <source>Time units</source> <translation>Zeiteinheiten</translation> </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>Zeiteinheit für Geschwindigkeit bei Aufstieg/Abstieg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Minuten</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Sekunden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Anzeigen</translation> </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>Nicht benutzte Flaschen unter Ausrüstung anzeigen</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="679"/> + <source>show average depth</source> + <translation>Durchschnittstiefe anzeigen</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="731"/> <source>GFLow at max depth</source> <translation>GF low bei maximaler Tiefe anwenden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Sonstiges</translation> </message> @@ -1979,32 +2040,32 @@ Bitte entferne diese zuerst.</translation> <translation>Einstellungen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GF low</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GF high</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>Bitte Programm neu starten</translation> </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>Um die neue Sprache laden zu können, muss Subsurface neu gestartet werden.</translation> </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>Standard Logfile öffnen</translation> </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>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> </message> @@ -2012,22 +2073,17 @@ Bitte entferne diese zuerst.</translation> <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>Vorschau</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>Drucken</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>Schließen</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Drucken</translation> </message> @@ -2153,72 +2209,72 @@ Bitte entferne diese zuerst.</translation> <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>unbekannt</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>Tauchgang Nr %1 - %2</translation> </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>max Tiefe: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Dauer: %1 Minuten</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Verw. Gas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>AMV:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>Blei:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Notizen:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Tauchgruppenleiter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Partner:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Anzug:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Sicht:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Bewertung:</translation> </message> @@ -2226,40 +2282,75 @@ Bitte entferne diese zuerst.</translation> <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>Gaswechsel setzen</translation> </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>Markierung setzen</translation> </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>Entferne Ereigniss</translation> </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>Ähnliche Ereignisse ausblenden</translation> </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>Name bearbeiten</translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="733"/> <source>Unhide all events</source> <translation>Alle Ereignisse einblenden</translation> </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="746"/> + <source>Hide events</source> + <translation>Ereignisse ausblenden</translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="746"/> + <source>Hide all %1 events?</source> + <translation>Alle %1 Ereignisse ausblenden?</translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="776"/> + <source>Remove the selected event?</source> + <translation>Ausgewähltes Ereignis entfernen?</translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="777"/> + <source>%1 @ %2:%3</source> + <translation>%1 @ %2:%3</translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="832"/> + <source>Edit name of bookmark</source> + <translation>Name der Markierung bearbeiten</translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="833"/> + <source>Custom name:</source> + <translation>Benutzerdefinierter Name:</translation> + </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>Luft</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>Diesen Punkt entfernen</translation> </message> @@ -2269,22 +2360,22 @@ Bitte entferne diese zuerst.</translation> <translation>Schließen</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Ø</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Min.</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Max.</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>Karte verschieben und mit Doppelklick Tauchplatz markieren</translation> </message> @@ -2292,12 +2383,12 @@ Bitte entferne diese zuerst.</translation> <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>Neu nummerieren</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>Neue erste Nummer</translation> </message> @@ -2305,52 +2396,52 @@ Bitte entferne diese zuerst.</translation> <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>Ausgewählte Zeiten verschieben</translation> </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>Ausgewählte Zeiten von Bild(ern) verschieben um...</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="99"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="102"/> <source>earlier</source> <translation>früher</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>später</translation> </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>Um den Zeitversatz zwischen der Uhrzeit des Tauchcomputers und der Kamera zu berechnen machen sie einfach ein Bild ihres Tauchcomputers mit der Kamera. Laden sie dieses Bild in den Computer und drücken diesen Knopf.</translation> </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>Versatz der Kamerazeit festlegen</translation> </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>Wähle Bild des Tauchcomputers das die Zeit zeigt</translation> </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>Welche/s Datum/Zeit werden im Bild angezeigt?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="181"/> + <location filename="../qt-ui/simplewidgets.cpp" line="203"/> <source>Open Image File</source> <translation>Öffne Bilddateien</translation> </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>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -2358,27 +2449,43 @@ Bitte entferne diese zuerst.</translation> <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>Ausgewählte Zeiten verschieben</translation> </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>Ausgewählte Zeiten verschieben um...</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="73"/> + <location filename="../qt-ui/shifttimes.ui" line="72"/> + <source>Shifted time:</source> + <translation>Verschobene Zeit:</translation> + </message> + <message> + <location filename="../qt-ui/shifttimes.ui" line="79"/> + <source>Current time:</source> + <translation>Aktuelle Zeit:</translation> + </message> + <message> + <location filename="../qt-ui/shifttimes.ui" line="86"/> + <location filename="../qt-ui/shifttimes.ui" line="93"/> + <source>0:0</source> + <translation>0:0</translation> + </message> + <message> + <location filename="../qt-ui/shifttimes.ui" line="126"/> <source>h:mm</source> <translation>h:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>früher</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>später</translation> </message> @@ -2414,42 +2521,42 @@ Bitte entferne diese zuerst.</translation> <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>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Verbinde...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>Herunterladen beendet</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>Fehler beim Herunterladen: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Verbindungsfehler: </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>Ungültige Benutzerkennung</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>Verstehe die Antwort nicht!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Erfolgreich geladen!</translation> </message> @@ -2465,17 +2572,17 @@ Bitte entferne diese zuerst.</translation> <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>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2488,6 +2595,49 @@ Bitte entferne diese zuerst.</translation> <translation>Information</translation> </message> </context> +<context> + <name>UpdateManager</name> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="36"/> + <source>Check for updates.</source> + <translation>Neue Version suchen</translation> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="37"/> + <source><h3>Subsurface was unable to check for updates.</h3></source> + <translation><h3>Subsurface konnte nicht nach neuen Versionen suchen.</h3></translation> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="42"/> + <source><br/><b>The following error occurred:</b><br/></source> + <translation><br/><b>Folgende Fehlermeldung erhalten:</b><br/></translation> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="43"/> + <source><br/><br/><b>Please check your internet connection.</b></source> + <translation><br/><br/><b>Bitte Internet Verbindung Überprüfen.</b></translation> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="52"/> + <source>You are using the latest version of subsurface.</source> + <translation>Dies ist die aktuelle Subsurface Version</translation> + </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>Eine neuere Subsurface Version kann hier heruntergeladen werden<br/><a href="%1"</a></translation> + </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><b>Eine neue Subsurface Version wurde freigegeben.</b><br/><br/>%1</translation> + </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>Während der Suche nach einer neuen Version ist ein Fehler aufgetreten.<br/><br/>%1</translation> + </message> +</context> <context> <name>UserManual</name> <message> @@ -2504,12 +2654,12 @@ Bitte entferne diese zuerst.</translation> <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>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2543,11 +2693,16 @@ Bitte entferne diese zuerst.</translation> </message> <message> <location filename="../qt-ui/webservices.ui" line="85"/> + <source>Save User ID locally?</source> + <translation>Benutzer-Kennung lokal speichern?</translation> + </message> + <message> + <location filename="../qt-ui/webservices.ui" line="92"/> <source>Password</source> <translation>Passwort</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Hochladen</translation> </message> @@ -2565,37 +2720,37 @@ Bitte entferne diese zuerst.</translation> <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>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Gewicht</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>Hier klicken entfernt dieses Gewichtssystem.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="442"/> + <location filename="../qt-ui/models.cpp" line="454"/> <source>lbs</source> <translation>US Pfund</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> @@ -2603,79 +2758,79 @@ Bitte entferne diese zuerst.</translation> <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>Jahr > Monat / Reise</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1659"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1662"/> <source>Duration Total</source> <translation>Dauer Gesamt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> Ø</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> Kürzester</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> Längster</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Tiefe (%1) Durchschnitt</translation> </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> Minimum</translation> </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> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>AMV (%1) Durchschnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2685,72 +2840,72 @@ Mittel</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="57"/> + <location filename="../dive.c" line="58"/> <source>pascal</source> <translation>Pa</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>cu.ft.</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>US Pfund</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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) oder (%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> @@ -2782,250 +2937,246 @@ Mittel</translation> <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>Fehler beim Lesen von '%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>maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>keine</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>Deko-Stopp</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>Aufstieg</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>tiefster Deko-Stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>Arbeit</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>Sender</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>Verletzung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>Markierung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>Oberfläche</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>Sicherheitsstopp</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>Gaswechsel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>Sicherheitsstopp (freiwillig)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>Sicherheitsstopp (verpflichtend)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>Tiefen-Stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>Sicherheits-Stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>Tauchgangsdauer</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>unterhalb Dekotiefe</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Max. Tiefe</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>PO₂</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>verbleibende Atemzeit</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>Richtung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Gewebewarnung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>Nullzeit</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>ungültige Ereignisnummer</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>Nicht in der Lage, einen Parser für %s %s zu erstellen</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Fehler beim Registrieren der Daten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Fehler beim Lesen des Datums</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Tauchgang Nr. %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>Fehler beim Lesen der Dauer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Fehler beim Lesen der maximalen Tiefe</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Fehler beim Lesen der Gasgemischszahl</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Fehler beim Lesen des Salzgehalts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Kein Oberflächendruck erhalten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Fehler beim Lesen der Gasgemischs</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Fehler beim Lesen der Samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Ereignis: warte auf Benutzeraktion</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%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>Fehler beim Registrieren der Ereignisbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Fehler beim Importieren der Tauchgangsdaten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Fehler beim Öffnen von %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>Unverständliche Prozentangabe %s @@ -3033,89 +3184,83 @@ Mittel</translation> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Fehler beim Lesen von '%s'. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Fehler beim Lesen von '%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>Datenbank Anfrage 'get_events' fehlgeschlagen. </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>Datenbank Anfrage 'get_tags' fehlgeschlagen. </translation> </message> <message> - <location filename="../file.c" line="176"/> + <location filename="../file.c" line="166"/> <source>Database connection failed '%s'. </source> <translation>Datenbank Verbindung fehlgeschlagen '%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>Datenbank Anfrage fehlgeschlagen '%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>Datenbank Anfrage 'get_cylinders' fehlgeschlagen. </translation> </message> <message> - <location filename="../parse-xml.c" line="2004"/> + <location filename="../parse-xml.c" line="2005"/> <source>Database query get_changes failed. </source> <translation>Datenbank Anfrage 'get_changes' fehlgeschlagen. </translation> </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>Datenbank Anfrage 'get_profile_sample' fehlgeschlagen. </translation> </message> <message> - <location filename="../parse-xml.c" line="2102"/> + <location filename="../parse-xml.c" line="2103"/> <source>Can't open stylesheet %s</source> <translation>Kann Stylesheet %s nicht öffnen</translation> </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>Kann Gasgemisch %d/%d nicht finden</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>Zu viele Gasgemische</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 @@ -3128,47 +3273,47 @@ basierend auf GFlow = %.0f und 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>Tauchen auf %.*f %s in %d:%02d min - Gesamtzeit %d:%02u mit %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>Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Gaswechsel zu %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Gasverbrauch: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f%s %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> @@ -3177,336 +3322,343 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1234"/> + <location filename="../profile.c" line="1229"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1238"/> + <location filename="../profile.c" line="1233"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1244"/> + <location filename="../profile.c" line="1239"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1247"/> + <location filename="../profile.c" line="1242"/> <source>SAC: %2.1fl/min </source> - <translation>SAC: %2.1fl/min + <translation>AMV: %2.1fl/min </translation> </message> <message> - <location filename="../profile.c" line="1249"/> + <location filename="../profile.c" line="1244"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1251"/> + <location filename="../profile.c" line="1246"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1253"/> + <location filename="../profile.c" line="1248"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1255"/> + <location filename="../profile.c" line="1250"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1253"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </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>EAD: %d%s -END: %d%s EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1271"/> + <location filename="../profile.c" line="1264"/> + <source>END: %d%s +EADD: %d%s +</source> + <translation>END: %d%s +EADD: %d%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1276"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Sicherheitsstop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1274"/> + <location filename="../profile.c" line="1279"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Sicherheitsstop: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1279"/> + <location filename="../profile.c" line="1284"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1282"/> + <location filename="../profile.c" line="1287"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1286"/> + <location filename="../profile.c" line="1291"/> <source>In deco </source> <translation>In Deko </translation> </message> <message> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1293"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1292"/> + <location filename="../profile.c" line="1297"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1300"/> + <location filename="../profile.c" line="1305"/> <source>In deco (calc) </source> <translation>Deko (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1302"/> + <location filename="../profile.c" line="1307"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1305"/> + <location filename="../profile.c" line="1310"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1313"/> <source>Calculated ceiling %.0f%s </source> <translation>Berechneter tiefster Deko-Stopp %.0f %s </translation> </message> <message> - <location filename="../profile.c" line="1314"/> + <location filename="../profile.c" line="1319"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Gewebe %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1320"/> + <location filename="../profile.c" line="1325"/> <source>heartbeat: %d </source> <translation>Herzschlag: %d </translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1327"/> <source>bearing: %d </source> <translation>Peilung: %d </translation> </message> <message> - <location filename="../profile.c" line="1414"/> + <location filename="../profile.c" line="1419"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </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>%s %sTiefe:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sTiefe:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sDruck:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 Tauchgänge)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 Tauchgang)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>Boot</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>Ufer</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>Strömung</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>tief</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>Kaverne</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>Eis</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>Wrack</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>Höhle</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>Berg</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>Pool</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>See</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>Fluss</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>Nacht</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>süß</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>Schüler</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>Foto</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>Ausbilder</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>deko</translation> </message> @@ -3556,97 +3708,97 @@ EADD: %d%s <translation>(keine Tauchgänge)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>So</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Mo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Di</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>Mi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Do</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Fr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>Sa</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Mär</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>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Dez</translation> </message> diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts index 49b463417..8f3f4eed1 100644 --- a/translations/subsurface_el_GR.ts +++ b/translations/subsurface_el_GR.ts @@ -37,38 +37,43 @@ <translation>O</translation> </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>Πατώντας εδώ θα διαγραφή αυτή η φιάλη.</translation> </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>Η φιάλη δεν μπορεί να διαγραφεί</translation> </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>Αυτό το αέριο είναι σε χρήση. Μόνο φιάλες που δεν χρησιμοποιούνται μπορούν να διαγραφούν</translation> </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> @@ -76,7 +81,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>Επεξεργασία Ονομάτων Υπολογιστών Κατάδυσης</translation> </message> @@ -96,22 +101,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>Μοντέλο</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>ID Συσκευής</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Όνομα</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>Πατώντας εδώ θα διαγραφεί αυτός ο υπολογιστής κατάδυσης.</translation> </message> @@ -119,28 +124,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>αέρας</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>EAN%1</translation> </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>Bailing out σε ανοικτό κύκλωμα</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>έναρξη</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>λήξη</translation> @@ -149,12 +154,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>αέρας</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>EAN%1</translation> </message> @@ -162,12 +167,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>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation>cuft/min</translation> </message> @@ -175,112 +180,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>Εμφάνιση Πεδίου Αναζήτησης</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>επέκταση όλων</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>σύμπτυξη όλων</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>Σύμπτυξη των άλλων</translation> </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>αφαίρεση κατάδυσης(-σεων) από το ταξίδι</translation> </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>δημιουργία νέου ταξιδιού από πάνω</translation> </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>προσθήκη κατάδυσης(σεων) στο ταξίδι αμέσως από πάνω</translation> </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>συγχώνευση με το ταξίδι από πάνω</translation> </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>συγχώνευση με το ταξίδι από κάτω</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>διαγραφή κατάδυσης(-σεων)</translation> </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>σημειώστε την κατάδυση(σεις) ως άκυρη</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>αποθήκευση ως...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>εξαγωγή ως UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>αλλαγή χρόνων</translation> </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>μεταφόρτωση κατάδυσης(σεων) στο divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>Αποθήκευση Καταδύσεων ως...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Αποθήκευση Αρχείου ως...</translation> </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>UDDF αρχεία (*.uddf *.UDDF)</translation> </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>συγχώνευση επιλεγμένων καταδύσεων</translation> </message> @@ -470,22 +480,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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Handler Position Error</translation> </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>Μία ή περισσότερες στάσεις θα χαθούν, @@ -495,37 +505,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>AIR</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Τελικό Βάθος</translation> </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>Διάρκεια</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Χρησιμοποιημένο Αέριο</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation>Απόρριψη του Πλάνου;</translation> </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>Είστε έτοιμοι να απορρίψετε το Πλάνο.</translation> </message> @@ -533,17 +548,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>Πόντοι Dive Planner</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>Διαθέσιμα Αέρια</translation> </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>add dive data point</translation> </message> @@ -551,72 +566,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>Βάθος</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>Ώρα</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>Πίεση</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>Θερμοκρασία</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> @@ -624,67 +639,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>ημερομηνία</translation> </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>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</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>στολή</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>φιάλη</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>τοποθεσία</translation> </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>maxCNS</translation> </message> @@ -692,44 +707,44 @@ 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>Άκυρη απάντηση από τον σέρβερ</translation> </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>Expected XML tag 'DiveDateReader', got instead '%1</translation> </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>Expected XML tag 'DiveDates' not found</translation> </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>Malformed XML response. Line %1: %2</translation> </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>καμία κατάδυση δεν έχει επιλεγεί</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> - <translation>αποτυχία στη δημιουργία του zip αρχείου για μεταφόρτωση: %1</translation> + <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> - <translation>δεν μπορεί να δημιουργηθεί το προσωρινό αρχείο: %1</translation> + <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> - <translation>εσωτερικό σφάλμα: %1</translation> + <source>internal error: %s</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> @@ -737,70 +752,70 @@ Please, remove them first.</source> <translation>εσωτερικό σφάλμα</translation> </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>Done</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>Μεταφόρτωση λίστας καταδύσεων...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>Λήψη λίστας καταδύσεων...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>Λήψη %1 καταδύσων...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>Η λήψη τελείωσε - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Κατεστραμμένη λήψη</translation> </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>Το αρχείο αυτό δεν μπορούσε να ανοιχθεί: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>Η μεταφόρτωση απέτυχε</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Η μεταφόρτωση πέτυχε</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>Login failed</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>Cannot parse response</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Σφάλμα: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Η μεταφόρτωση τελείωσε</translation> </message> @@ -923,7 +938,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>Επεξεργασία Επιλεγμένων Τοποθεσιών Κατάδυσης</translation> </message> @@ -932,13 +947,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>Σημειώσεις</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>Τοποθεσία</translation> </message> @@ -964,13 +979,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>Εξωτερική Θερμοκρασία</translation> </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>Θερμοκρασία Νερού</translation> </message> @@ -996,7 +1011,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>Σημειώσεις</translation> </message> @@ -1127,13 +1142,13 @@ Please, remove them first.</source> <translation>Προσθήκη Βαρών</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Τοποθεσία Ταξιδιού</translation> </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>Σημειώσεις Ταξιδιού</translation> </message> @@ -1148,61 +1163,61 @@ Please, remove them first.</source> <translation>Ακύρωση</translation> </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>Το ταξίδι αυτό επεξεργάζεται αυτή τη στιγμή.</translation> </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>Πολλαπλές καταδύσεις επεξεργάζονται αυτή τη στιγμή.</translation> </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>Η κατάδυση επεξεργάζεται αυτή τη στιγμή.</translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>άγνωστο</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> @@ -1210,109 +1225,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>Φίλτρο</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>&File</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>&View</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>&Help</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>&Import</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>&New logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Νέο</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>&Open logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Άνοιγμα</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>&Save</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Αποθήκευση</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Αποθήκευση ως...</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>Ctrl+Shift+S</translation> </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>Κλείσιμο</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>Εξαγωγή σε &UDDF</translation> </message> @@ -1327,132 +1342,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>Ctrl+U</translation> </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>Εκτύ&πωση</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>Έ&ξοδος</translation> </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>Εισαγωγή από &υπολογιστή κατάδυσης</translation> </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>Εισαγωγή δεδομένων &GPS από την υπηrεσία Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>&Επεξεργασία Ονομάτων Συσκευών</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>Επ&αναρίθμηση</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>&Ετήσια Στατιστικά</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Λίστα Καταδύσεων</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Προφίλ</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Πληροφορίες</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Όλα</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>Εγχερίδιο &Χρήσης</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Globe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>Σχε&διασμός Κατάδυσης</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>Εισαγωγή από Divelogs.de</translation> </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>Ctrl+P</translation> </message> @@ -1475,11 +1510,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>...</translation> </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> @@ -1504,221 +1540,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>Προτιμήσεις</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Προσθήκη Κατάδυσης</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Αυτόματη Oμαδοποίηση</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>Προηγ. DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Αριστερά</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>Επόμενο DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Δεξιά</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Επιλογή Συμβάντων</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Εισαγωγή Πλάνου</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>Περί...</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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>Άνοιγμα Αρχείου</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>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν κλέισετε το αρχείο.</translation> </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>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν προσπαθήσετε να σχεδιάσετε μια κατάδυση.</translation> </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>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν προσπαθήσετε να προσθέσετε μια κατάδυση.</translation> </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>Θέλετε να αποθηκευτούν οι αλλαγές του αρχείου %1;</translation> </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>Θέλετε να αποθηκευθούν οι αλλαγές του αρχείου δεδομένων;</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Αποθήκευση Αλλαγών;</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>Οι αλλαγές θα χαθούν αν δεν τις αποθηκεύσετε.</translation> </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>Αποθήκευση Αρχείου ως...</translation> </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>Προειδοποίηση</translation> </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>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν ανοίξετε ένα νέο αρχείο.</translation> </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>UDDF αρχεία (*.uddf *.UDDF)</translation> </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 type="unfinished"/> </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>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </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> @@ -1801,177 +1847,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>Σύστημα</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Μετρικό</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Προσαρμογή</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Βάθος</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>μέτρα</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>πόδια</translation> </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>λίτρα</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>cu ft</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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>Προεπιλογή Συστήματος</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Φίλτρο</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Πίεση</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Όγκος</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Θερμοκρασία</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Βάρος</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>Μονάδες Μέτρησης Χρόνου</translation> </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>Παρανομαστής Ταχύτητας Ανόδου/Καθόδου</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Λεπτά (min)</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Δευτερόλεπτα (sec)</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Εμφάνιση</translation> </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>GFlow στο μέγιστο βάθος</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Διάφορα</translation> </message> @@ -1981,32 +2042,32 @@ Please, remove them first.</source> <translation>Προτιμήσεις</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>Απαιτείται επανεκκίνηση</translation> </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>Για να φορτώσε σωστά μια γλώσσα πρέπει να επανεκκινήσεσε το Subsurface</translation> </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>Άνοιγμα προεπιλεγμένου Aρχείου Kαταγραφής (logfile)</translation> </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>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> @@ -2014,22 +2075,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>&Προεπισκόπηση</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>Εκτύ&πωση</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>Έ&ξοδος</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Εκτύπωση</translation> </message> @@ -2155,72 +2211,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>άγνωστο</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>Κατάδυση #%1 - %2</translation> </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>Μέγιστο Βάθος: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Διάρκεια: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Αέριο που χρησιμοποιήθηκε:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>Βάρη:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Σημειώσεις:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Ζευγάρι:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Στολή:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Ορατότητα:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Βαθμός:</translation> </message> @@ -2228,40 +2284,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>Προσθήκη Αλλαγής Αερίου</translation> </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>Προσθήκη σελιδοδείκτη</translation> </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>Αφαίρεση συμβάντος</translation> </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>Απόκρυψη παρόμοιων συμβάντων</translation> </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>Απόκρυψη όλων των συμβάντων</translation> </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>ΑΕΡΑΣ</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>Αφαίρεση αυτού του σημείου</translation> </message> @@ -2271,22 +2362,22 @@ Please, remove them first.</source> <translation>Κλείσιμο</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Μέσος όρος</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Ελάχιστο</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Μέγιστο</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>Μετακινήστε τον χάρτη και με διπλό κλικ ορίστε την τοποθεσία κατάδυσης</translation> </message> @@ -2294,12 +2385,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>Επαναρίθμηση</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>Νέος αρχικός αριθμός</translation> </message> @@ -2307,52 +2398,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>Μετακίνηση επιλεγμένων χρόνων</translation> </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>νωρίτερα</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>αργότερα</translation> </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> @@ -2360,27 +2451,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>Μετακίνηση επιλεγμένων χρόνων</translation> </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>Μετακίνηση επιλεγμένων καταδύσεων για</translation> </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>h:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>νωρίτερα</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>αργότερα</translation> </message> @@ -2416,42 +2523,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>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Σύνδεση...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>Η λήψη τελείωσε</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>Σφάλμα λήψης: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Σφάλμα Επικοινωνίας:</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>Άκυρος έλεγχος χρήστη!</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>Cannot parse response!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Επιτυχής Λήψη!</translation> </message> @@ -2467,17 +2574,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>Περιγραφή</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2490,6 +2597,49 @@ Please, remove them first.</source> <translation>Πληροφορίες</translation> </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> @@ -2506,12 +2656,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>Περιγραφή</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2545,11 +2695,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>Κωδικός</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Μεταφόρτωση</translation> </message> @@ -2567,37 +2722,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>Τύπος</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Βάρος</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>Πατήστε εδώ για διαγραφή αυτού του συστήματος βαρών</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</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> @@ -2605,79 +2760,79 @@ 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>Έτος > Μήνας / Ταξίδι</translation> </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>Συνολική Διάρκεια</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> Μέσος Όρος</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> Συντομότερο</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> Μακρύτερο</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Μέσο Βάθος (%1)</translation> </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> Ελάχιστο</translation> </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> Μέγιστο</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>Μέσο SAC (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Μέση @@ -2687,72 +2842,72 @@ SAC (%1)</translation> <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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) ή (%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> @@ -2784,250 +2939,246 @@ SAC (%1)</translation> <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>Αποτυχία ανάγνωσης '%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>Μέγιστο αριθμός υποστηριζόμενων στηλών στην εισαγωγή CSV είναι %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>κανένα</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>στάση αποσυμπίεσης</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>άνοδος</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>ταβάνι</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>φόρτο εργασίας</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>πομπός</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>παράβαση</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>σελιδοδείκτης</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>επιφάνεια</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>στάση ασφαλείας</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>αλλαγή αερίου</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>στάση ασφαλείας (προληπτική)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>στάση ασφαλείας (υποχρεωτική)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>βαθιά στάση</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>ταβάνι (στάση ασφαλείας)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>διάρκεια</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>below floor</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>μέγιστο βάθος</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>airtime</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>heading</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>προειδοποίηση επιπέδου ιστών</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>non stop time</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>άκυρος αριθμός συμβάντος</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>Αδύνατον να αναλυθεί το %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Σφάλμα στην καταχώρηση των δεδομένων</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Σφάλμα στην ημερομηνία</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Κατάδυση %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>Σφάλμα στην διάρκεια της κατάδυσης</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Σφάλμα στο μέγιστο βάθος</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Σφάλμα στον αριθμό των αερίων</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Σφάλμα στην απόκτηση της αλμυρότητας</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Σφάλμα στην απόκτηση της ατμοσφαιρικής πίεσης</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Σφάλμα στο μίγμα αερίων</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Σφάλμα στα δείγματα</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Συμβάν: Περιμένοντας για ενέργεια από τον χρήστη</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%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>Σφάλμα στην καταχώρηση του συμβάντος</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Σφάλμα στην καταχώρηση της ακύρωσης</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Σφάλμα στην εισαγωγή δεδομένων</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Αδύνατον να ανοιχθεί το %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>Περίεργο νούμερο ποσοστού %s @@ -3035,85 +3186,79 @@ SAC (%1)</translation> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Σφάλμα στην ανάλυση του '%s' -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Σφάλμα στην ανάλυση του '%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>Σφάλμα στο ερώτημα get_events της βάσης δεδομένων </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>Σφάλμα στην επικοινωνία με την βάση δεδομένων '%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>Σφάλμα στο ερώτημα της βάσης δεδομένων '%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>Αδύνατο το άνοιγμα του stylesheet %s</translation> </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>Το αέριο %d/%d δεν υπάρχει</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>Πάρα πολλά μείγματα αερίων</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 @@ -3125,357 +3270,363 @@ based on GFlow = %.0f and 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>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %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>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Switch gas to %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Κατανάλωση αερίου: </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>%sT: %d:%02d min</translation> </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>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 dives)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 dive)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>σκάφος</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>ακτή</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>ρεύμα</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>βαθιά</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>ανοικτό σπήλαιο</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>πάγος</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>ναυάγιο</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>σπήλαιο</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>υψόμετρο</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>πισίνα</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>λίμνη</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>ποτάμι</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>νύχτα</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>fresh</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>μαθητής</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>φωτογραφία</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>video</source> <translation>βίντεο</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>instructor</source> <translation>εκπαιδευτής</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>αποσυμπίεση</translation> </message> @@ -3525,97 +3676,97 @@ EADD: %d%s <translation>(καμία κατάδυση)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>Κυρ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Δευ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Τρι</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>Τετ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Πεμ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Παρ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>Σαβ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Ιαν</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Φεβ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Μαρ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Apr</source> <translation>Απρ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>May</source> <translation>Μαι</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Ιουν</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Ιουλ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Αυγ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Σεπ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Οκτ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Νοε</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Δεκ</translation> </message> diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts index 09b1f38a1..e644d7c0f 100644 --- a/translations/subsurface_es_ES.ts +++ b/translations/subsurface_es_ES.ts @@ -37,37 +37,42 @@ <translation>O</translation> </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>Pulsar aquí borrará esta botella</translation> </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>La botella no puede borrarse</translation> </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>Gas en uso. Solo pueden borrarse botellas que no se usan en la inmersión.</translation> </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>pie³</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>Editar nombres de ordenador de buceo</translation> </message> @@ -95,22 +100,22 @@ el ordenador de buceo seleccionado?</translation> <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>Modelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>ID del dispositivo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Nombre</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>Pulsar aquí borrará este ordenador de buceo.</translation> </message> @@ -118,28 +123,28 @@ el ordenador de buceo seleccionado?</translation> <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>aire</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>EAN%1</translation> </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>Cambio de emergencia a 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>comienzo</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>fin</translation> @@ -148,12 +153,12 @@ el ordenador de buceo seleccionado?</translation> <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>aire</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>EAN%1</translation> </message> @@ -161,12 +166,12 @@ el ordenador de buceo seleccionado?</translation> <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>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation>Pie³/min</translation> </message> @@ -174,112 +179,117 @@ el ordenador de buceo seleccionado?</translation> <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>Mostrar ventana de busqueda</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>Expandir todo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>Encoger todo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>Encoger otros</translation> </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>Borrar inmersión(es) del viaje</translation> </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>Crear nuevo viaje arriba</translation> </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>Añadir inmersión(es) al viaje de arriba</translation> </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>mezclar viaje con el viaje de arriba</translation> </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>mezclar viaje con el viaje de abajo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>Borrar inmersión(es)</translation> </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>Marcar inmersión(es) como inválida</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>Guardar como</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>Exportar como UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>Desplazar horas</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="735"/> + <location filename="../qt-ui/divelistview.cpp" line="765"/> <source>load images</source> <translation>Carga imágenes</translation> </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>Subir inmersión(es) a divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>Guardar las inmersiones como…</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Guardar archivo como</translation> </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>Archivos UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="801"/> + <location filename="../qt-ui/divelistview.cpp" line="831"/> <source>Open Image Files</source> <translation>Abrir archivo de imagen</translation> </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>Archivos de imagen (</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="760"/> <source>merge selected dives</source> <translation>Mezclar las inmersiones seleccionadas</translation> </message> @@ -469,22 +479,22 @@ el ordenador de buceo seleccionado?</translation> <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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Error en la posición del punto</translation> </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>Una o más de tus paradas se perderán con estas operaciones. @@ -494,37 +504,42 @@ Por favor, bórralas antes.</translation> <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>AIRE</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Profundidad final</translation> </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>Duración</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Gas usado</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation>¿Quiere descartar el plan?</translation> </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>Está a punto de descartar su plan.</translation> </message> @@ -532,17 +547,17 @@ Por favor, bórralas antes.</translation> <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>Puntos del planificador de inmersiones</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>Gases disponibles</translation> </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>Añadir punto de datos de inmersión.</translation> </message> @@ -550,72 +565,72 @@ Por favor, bórralas antes.</translation> <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>Profundidad</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>Hora de entrada</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>Presión</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>Temperatura</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>Color</translation> </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>Usuario introducido</translation> </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>Lista de botellas</translation> </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>Presión S</translation> </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>Presión I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Ceiling</source> <translation>Techo</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>SAC</source> <translation>CAS</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>PN2</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>PHE</source> <translation>PHE</translation> </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> @@ -623,67 +638,67 @@ Por favor, bórralas antes.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1288"/> + <location filename="../qt-ui/models.cpp" line="1305"/> <source>#</source> <translation>N.º</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1291"/> + <location filename="../qt-ui/models.cpp" line="1308"/> <source>date</source> <translation>Fecha</translation> </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>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</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>traje</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>bot</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>Ubicación</translation> </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>maxCNS</translation> </message> @@ -691,44 +706,44 @@ Por favor, bórralas antes.</translation> <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>Respuesta del servidor no válida.</translation> </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>No se encontró la etiqueta XML esperada «DiveDateReader», se obtuvo en su lugar «%1»</translation> </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>No se encontró la etiqueta XML esperada «DiveDates»</translation> </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>Respuesta XML mal formada. Línea </translation> </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>No se seleccionó ninguna inmersión</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> - <translation>Fallo al crear archivo zip para subir: %1</translation> + <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> - <translation>No se puede crear archivo temporal: %1</translation> + <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> - <translation>Error interno: %1</translation> + <source>internal error: %s</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> @@ -736,70 +751,70 @@ Por favor, bórralas antes.</translation> <translation>Error interno</translation> </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>Hecho</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>Subiendo lista de inmersiones…</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>Descargando lista de inmersiones…</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>Descargando %1 inmersiones…</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>Descarga finalizada - </translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Descarga corrompida</translation> </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>El archivo no pudo abrirse %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>La subida ha fallado</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Subida correcta</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>El acceso ha fallado</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>No se puede leer la respuesta</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Subida finalizada</translation> </message> @@ -922,7 +937,7 @@ Por favor, bórralas antes.</translation> <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>Editar los puntos de buceo seleccionados.</translation> </message> @@ -931,13 +946,13 @@ Por favor, bórralas antes.</translation> <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>Notas de la inmersió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>Ubicación</translation> </message> @@ -963,13 +978,13 @@ Por favor, bórralas antes.</translation> </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>Temperatura del aire</translation> </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>Temperatura del agua</translation> </message> @@ -995,7 +1010,7 @@ Por favor, bórralas antes.</translation> </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>Notas</translation> </message> @@ -1126,13 +1141,13 @@ Por favor, bórralas antes.</translation> <translation>Añadir sistema de lastre</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Ubicación del viaje</translation> </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>Notas del viaje</translation> </message> @@ -1146,62 +1161,62 @@ Por favor, bórralas antes.</translation> <source>Cancel</source> <translation>Cancelar</translation> </message> - <message> - <location filename="../qt-ui/maintab.cpp" line="232"/> - <source>Air temp [%1]</source> - <translation type="unfinished"/> - </message> <message> <location filename="../qt-ui/maintab.cpp" line="233"/> - <source>Water temp [%1]</source> - <translation type="unfinished"/> + <source>Air temp [%1]</source> + <translation>Temp. Aire [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="234"/> + <source>Water temp [%1]</source> + <translation>Temp. Agua [%1]</translation> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>This trip is being edited.</source> <translation>Este viaje está siendo editado.</translation> </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>Se están editando varias inmersiones.</translation> </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>Esta inmersión esta siendo editada.</translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>desconocido</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>O</translation> </message> @@ -1209,249 +1224,269 @@ Por favor, bórralas antes.</translation> <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>Filtros</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>Archivo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>Registro</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>&Vista</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>Ayuda</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>&Importar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>&Nuevo registro</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Nuevo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>Abrir registr&o</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>Guardar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Guardar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Guardar como</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>Ctrl+Shift+S</translation> </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>Cerrar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>Exportar &UDDF</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="138"/> <source>Enable the pN2 Graph</source> - <translation type="unfinished"/> + <translation>Activar el gráfico de pN2</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="164"/> <source>Enable the pHe graph</source> + <translation>Activar el gráfico de pHe</translation> + </message> + <message> + <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="326"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Enable EAD, END, and EADD</source> <translation>Activar PEA, PNE y EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Show NDL / TTS</source> - <translation type="unfinished"/> + <translation>Mostrar el NDL/TTS</translation> </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"/> + <translation>Cambiar de escala el eje de profundidad</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="681"/> + <location filename="../qt-ui/mainwindow.ui" line="709"/> <source>Ctrl+U</source> <translation>Ctrl+U</translation> </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>Im&primir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>Salir</translation> </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>Importar del or&denador de buceo</translation> </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>Importar datos &GPS del Servicio Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>&Editar nombres de dispositivos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>&Renumerar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>Estadísticas anuales</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Lista de inmersiones</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Perfil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Todo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>&Manual de usuario</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Globo </translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>P&lanificar Inmersión</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>Importar desde Divelogs.de</translation> </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>Ctrl+P</translation> </message> @@ -1474,11 +1509,12 @@ Por favor, bórralas antes.</translation> <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>…</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="300"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>Enable MOD</source> <translation>Activar la PMO</translation> </message> @@ -1503,221 +1539,231 @@ Por favor, bórralas antes.</translation> <translation>Calcular todos los tejidos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="378"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>Show SAC Rate</source> <translation>Mostrar tasa de CAS</translation> </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>Activar / Desactivar la regla</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Preferences</source> <translation>Preferencias</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Añadir inmersión</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Auto agrupar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>Anterior ordenador</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Izquierda</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>Siguiente ordenador</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Derecha</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Seleccionar eventos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Introducir Plan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>Acerca de Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="859"/> + <location filename="../qt-ui/mainwindow.ui" line="895"/> <source>Import Log Files</source> <translation>Importar archivos de registro</translation> </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>Importar archivos de registro de otras aplicaciones</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="878"/> + <location filename="../qt-ui/mainwindow.ui" line="914"/> <source>&Full Screen</source> <translation>Pantalla completa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="881"/> + <location filename="../qt-ui/mainwindow.ui" line="917"/> <source>Toggle Full Screen</source> <translation>Activar pantalla completa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="884"/> + <location filename="../qt-ui/mainwindow.ui" line="920"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="143"/> + <location filename="../qt-ui/mainwindow.cpp" line="173"/> <source>Open File</source> <translation>Abrir archivo</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>Por favor, guarda o cancela la edición de la inmersión actual antes de cerrar el archivo</translation> </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>Por favor, guarda o cancela la edición de la inmersión actual antes de intentar planificar otra.</translation> </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>Por favor, guarda o cancela la edición de la inmersión actual antes de intentar añadir otra.</translation> </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>¿Quiere guardar los cambios realizados en el archivo %1?</translation> </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>¿Quiere guardar los cambios realizados en el archivo de datos?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>¿Guardar los cambios?</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>Se perderán los cambios si no los guarda.</translation> </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>Guardar archivo como</translation> </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>Advertencia</translation> </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>Por favor, guarda o cancela la edición de la inmersión actual antes de abrir otro archivo.</translation> </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>Archivos UDDF (*.uddf *.UDDF)</translation> </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>Estadísticas anuales</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>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation> </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>Abrir archivo de registro de inmersiones</translation> </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>Archivos de registro (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;Archivos XML (*.xml);;Archivos UDDF/UDCF (*.uddf *.udcf);;Archivos Jdivelog (*.jlb);;Archivos Suunto (*.sde *.db);;Archivos CSV (*.csv);;Todos los archivos (*)</translation> </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>Por favor, termina la edición actual antes de intentar hacer otra.</translation> </message> @@ -1792,185 +1838,200 @@ Por favor, bórralas antes.</translation> <message> <location filename="../qt-ui/preferences.ui" line="237"/> <source>Animations</source> - <translation type="unfinished"/> + <translation>Animaciones</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="243"/> <source>Speed</source> + <translation>Velocidad</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="289"/> + <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>Sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Métrico</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Personalizar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Profundidad</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>metro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>pie</translation> </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>litro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>pie³</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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>Umbral al mostrar la pO2</translation> </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>Umbral al mostrar la pN2</translation> </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>Umbral al mostrar la pHe</translation> </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>ppO2 máxima al mostrar la PMO</translation> </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>Trazar en rojo el techo informado por el ordenador de buceo</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="655"/> - <source>unused tanks</source> - <translation>Botellas sin usar</translation> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="723"/> + <location filename="../qt-ui/preferences.ui" line="747"/> <source>System Default</source> <translation>Predeterminado del sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Filtros</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Presión</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Volumen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Peso</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>Unidades de tiempo</translation> </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>Denominador de la velocidad de ascenso/descenso</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Minutos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Segundos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Mostrar</translation> </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>GF bajo a la máxima profundidad</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Varios</translation> </message> @@ -1980,32 +2041,32 @@ Por favor, bórralas antes.</translation> <translation>Preferencias</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GF bajo</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GF alto</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>Reinicio requerido</translation> </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>Para cargar correctamente un nuevo lenguaje debes reiniciar Subsurface.</translation> </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>Abrir archivo de registro por defecto</translation> </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>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation> </message> @@ -2013,22 +2074,17 @@ Por favor, bórralas antes.</translation> <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>&Previsualizar</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>Imp&rimir</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>&Cerrar</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Imprimir</translation> </message> @@ -2154,72 +2210,72 @@ Por favor, bórralas antes.</translation> <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>desconocido</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>Inmersión n.º %1 - %2</translation> </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>Profundidad máxima: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Duración: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Gas usado:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>CAS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>Lastre:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Notas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Compañero:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Traje:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Visibilidad:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Calificación:</translation> </message> @@ -2227,40 +2283,75 @@ Por favor, bórralas antes.</translation> <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>Añadir cambio de gas</translation> </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>Añadir marcador</translation> </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>Borrar evento</translation> </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>Ocultar eventos similares</translation> </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>Revelar todos los eventos</translation> </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>AIRE</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>Borrar este punto</translation> </message> @@ -2270,22 +2361,22 @@ Por favor, bórralas antes.</translation> <translation>Cerrar</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Promedio</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Mínima</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Máxima</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>Mueve el mapa y haz doble click para fijar la posición del buceo</translation> </message> @@ -2293,12 +2384,12 @@ Por favor, bórralas antes.</translation> <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>Renumerar</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>Número de partida nuevo</translation> </message> @@ -2306,52 +2397,52 @@ Por favor, bórralas antes.</translation> <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>Desplazar las horas seleccionadas</translation> </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>Desplazar la hora de la(s) imagen(es) en</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="99"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="102"/> <source>earlier</source> <translation>más pronto</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>más tarde</translation> </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>Para calcular la desviación entre los relojes de tu ordenador de buceo y tu cámara utiliza esta última para sacar una foto de tu ordenador de buceo mientras muestra la hora actual. Descarga esa imagen a tu ordenador y pulsa este botón.</translation> </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>Determinar la desviación de la hora de la cámara</translation> </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>Selecciona la imagen del ordenador de buceo mostrando la hora</translation> </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>¿ Que fecha y hora se muestran en la imagen ?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="181"/> + <location filename="../qt-ui/simplewidgets.cpp" line="203"/> <source>Open Image File</source> <translation>Abrir archivo de imagen</translation> </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>Archivos de imagen (</translation> </message> @@ -2359,27 +2450,43 @@ Por favor, bórralas antes.</translation> <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>Desplazar las horas seleccionadas</translation> </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>Desplazar las horas de las inmersiones seleccionadas en</translation> </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>h:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>más pronto</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>más tarde</translation> </message> @@ -2415,42 +2522,42 @@ Por favor, bórralas antes.</translation> <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>Servicio web</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Conectando…</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>Descarga finalizada</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>Error de descarga: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Error de conexión:</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>El identificador de usuario no es válido.</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>No se puede analizar la respuesta.</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Se ha completado la descarga correctamente.</translation> </message> @@ -2466,17 +2573,17 @@ Por favor, bórralas antes.</translation> <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>Descripción</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2489,6 +2596,49 @@ Por favor, bórralas antes.</translation> <translation>Información</translation> </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> @@ -2505,12 +2655,12 @@ Por favor, bórralas antes.</translation> <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>Descripción</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2544,11 +2694,16 @@ Por favor, bórralas antes.</translation> </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>Contraseña</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Subir</translation> </message> @@ -2566,37 +2721,37 @@ Por favor, bórralas antes.</translation> <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>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Peso</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>Pulsar aquí borrará este sistema de lastre.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</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> @@ -2604,79 +2759,79 @@ Por favor, bórralas antes.</translation> <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>Año > Mes / Viaje</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1659"/> <source>#</source> <translation>N.º</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1662"/> <source>Duration Total</source> <translation>Duración Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> Más corta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> Más larga</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Profundidad (%1) Media</translation> </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> Mínimo</translation> </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> Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>CAS (%1) Medio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2686,72 +2841,72 @@ Media</translation> <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>pie³</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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) o (%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> @@ -2783,250 +2938,246 @@ Media</translation> <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>No se pudo leer «%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>El máximo número de columnas que soporta importar CSV es %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>ninguno</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>parada 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>ascenso</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>techo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>carga</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>transmisor</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>violación</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>marcador</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>superficie</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>parada de seguridad</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>cambio de mezcla</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>parada de seguridad (voluntaria)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>parada de seguridad (obligatoria)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>parada de profundidad</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>techo (parada de seguridad)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>duración de inmersió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>por debajo del techo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Profundidad Max</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>tiempo de aire</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>encabezado</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Alarma de nivel de tejidos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>tiempo sin parada</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>el número de evento no es válido</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>No es posible crear el analizador para %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Error al registrar los datos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Error al analizar la fecha</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Inmersión 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>Error al analizar el tiempo de buceo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Error al analizar la máxima profundidad</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Error al analizar el conteo de mezcla de gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Error al obtener salinidad del agua</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Error al obtener la presión en superficie</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Error al analizar la mezcla de gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Error al analizar las muestras</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Evento: esperando acción del usuario</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>modelo=%u (0x%08x), firmware=%u (0x%08x), n.º de serie=%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>Error al registrar el manejador de eventos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Error al registrar el manejador de cancelación</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Error al importar datos de inmersiones</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>No es posible crear el contexto de libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>No se pudo abrir %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>Porcentaje extraño al leer %s @@ -3034,89 +3185,83 @@ Media</translation> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>No se pudo analizar «%s». -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>No se pudo analizar «%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>Falló la petición get_events a la base de datos. </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>Consulta de la base de datos get_tags falló. </translation> </message> <message> - <location filename="../file.c" line="176"/> + <location filename="../file.c" line="166"/> <source>Database connection failed '%s'. </source> <translation>Falló la conexión a la base de datos «%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>Falló la petición a la base de datos «%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>Consulta de la base de datos get_cylinders falló. </translation> </message> <message> - <location filename="../parse-xml.c" line="2004"/> + <location filename="../parse-xml.c" line="2005"/> <source>Database query get_changes failed. </source> <translation>Consulta de la base de datos get_changes falló. </translation> </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>Consulta de la base de datos get_profile_sample falló. </translation> </message> <message> - <location filename="../parse-xml.c" line="2102"/> + <location filename="../parse-xml.c" line="2103"/> <source>Can't open stylesheet %s</source> <translation>No se puede abrir la hoja de estilo %s</translation> </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>No encuentro el gas %d/%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>Demasiadas mezclas de gas</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 @@ -3129,47 +3274,47 @@ basado en GFbajo = %.0f y GFalto = %.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>Cambio de cota a %.*f %s en %d:%02d min - runtime %d:%02u con %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>Permanecer a %.*f %s durante %d:%02d min - runtime %d:%02u en %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Cambio de gas a %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Consumo de gas: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f%s de %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> @@ -3178,335 +3323,338 @@ Prof: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1234"/> + <location filename="../profile.c" line="1229"/> <source>P: %d%s </source> <translation>Pres: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1238"/> + <location filename="../profile.c" line="1233"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1244"/> + <location filename="../profile.c" line="1239"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1247"/> + <location filename="../profile.c" line="1242"/> <source>SAC: %2.1fl/min </source> <translation>CAS: %2.1fl/min </translation> </message> <message> - <location filename="../profile.c" line="1249"/> + <location filename="../profile.c" line="1244"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1251"/> + <location filename="../profile.c" line="1246"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1253"/> + <location filename="../profile.c" line="1248"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1255"/> + <location filename="../profile.c" line="1250"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1253"/> <source>MOD: %d%s </source> <translation>PMO: %d%s </translation> </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>PEA: %d%s -PNE: %d%s -EADD: %d%s -</translation> + <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>Parada de seguridad: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1274"/> + <location filename="../profile.c" line="1279"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Parada de seguridad: tiempo desc @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1279"/> + <location filename="../profile.c" line="1284"/> <source>Deco: %umin @ %.0f%s </source> <translation>Parada deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1282"/> + <location filename="../profile.c" line="1287"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Parada deco: tiempo desc @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1286"/> + <location filename="../profile.c" line="1291"/> <source>In deco </source> <translation>En deco</translation> </message> <message> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1293"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1292"/> + <location filename="../profile.c" line="1297"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Parada deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1300"/> + <location filename="../profile.c" line="1305"/> <source>In deco (calc) </source> <translation>En deco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1302"/> + <location filename="../profile.c" line="1307"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1305"/> + <location filename="../profile.c" line="1310"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1313"/> <source>Calculated ceiling %.0f%s </source> <translation>Techo calculado %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1314"/> + <location filename="../profile.c" line="1319"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tejido %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1320"/> + <location filename="../profile.c" line="1325"/> <source>heartbeat: %d </source> <translation>Ritmo cardiaco: %d </translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1327"/> <source>bearing: %d </source> <translation>Soporte: %d </translation> </message> <message> - <location filename="../profile.c" line="1414"/> + <location filename="../profile.c" line="1419"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </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>%s %sD:%.1f%s</translation> + <translation>%s %sProf:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> - <translation>%s %sD:%.1f%s + <translation>%s %sProf:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sPres:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 inmersiones)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 inmersión)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>barco</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>orilla</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>a la deriva</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>profunda</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>caverna</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>hielo</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>pecio</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>cueva</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>altura</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>piscina</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>lago</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>río</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>noche</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>agua dulce</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>estudiante</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>foto</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>video</source> <translation>vídeo</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>instructor</source> <translation>instructor</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>deco</translation> </message> @@ -3556,97 +3704,97 @@ EADD: %d%s <translation>(ninguna inmersión)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>Do</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Lu</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Ma</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>Mi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Ju</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Vi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>Sa</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Ene</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Apr</source> <translation>Abr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>May</source> <translation>Mayo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Dic</translation> </message> diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts index 6c7740e5e..101260700 100644 --- a/translations/subsurface_et_EE.ts +++ b/translations/subsurface_et_EE.ts @@ -37,37 +37,42 @@ <translation>O</translation> </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>Siin klikkamine eemaldab selle ballooni</translation> </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>Ballooni ei saa eemaldada</translation> </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>See gaas on kasutusel. Eemaldada saab ainult neid balloone mida ei kasutata sellel sukeldumisel.</translation> </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>kuupjalg</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>Toimeta kompuutrite hüüdnimesid</translation> </message> @@ -95,22 +100,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>Mudel</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>Seadme ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Hüüdnimi</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>Siin klikkamine eemaldab selle kompuutri.</translation> </message> @@ -118,28 +123,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>õhk</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>EAN%1</translation> </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>Üleminek avatud süsteemile</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> algus</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> lõpp</translation> @@ -148,12 +153,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>õhk</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>EAN%1</translation> </message> @@ -161,12 +166,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>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation>kuupjalga/min</translation> </message> @@ -174,112 +179,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>Näita otsinguakent</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>laienda kõik</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>ahenda kõik</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>ahenda muud</translation> </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>kõrvalda sukeldumine/sukeldumised väljasõidust</translation> </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>loo uus väljasõit ülal</translation> </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>lisa sukeldumine/sukeldumised väljasõitu kohe eespool </translation> </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>ühenda väljasõit väljasõiduga ülal</translation> </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>ühenda väljasõit väljasõiduga all</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>kustuta sukeldumine/sukeldumised</translation> </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>Märgista sukeldumine/sukeldumised ebaõnnestunuks</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>salvesta nimega</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>ekspordi UDDF kujul</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>nihuta ajad</translation> </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>lae sukeldumised divelogs.de keskkonda</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>Salvesta sukeldumised nimega...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Salvesta fail nimega</translation> </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>UDDF failid (*.uddf *.UDDF)</translation> </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>ühenda valitud sukeldumised</translation> </message> @@ -469,22 +479,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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30 jalga</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Draiveri asukoha viga</translation> </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>Üks või enam peatust läheb selle operatsiooniga kaotsi, @@ -494,37 +504,42 @@ palun eemalda need esmalt.</translation> <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>ÕHK</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Lõppsügavus</translation> </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>Kestus</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Kasutatud gaas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>CC seadepunkt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation>Loobu plaanist?</translation> </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>Oled plaanist loobumas.</translation> </message> @@ -532,17 +547,17 @@ palun eemalda need esmalt.</translation> <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>Sukeldumise planeerija punktid</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>Saadavad gaasid</translation> </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>lisa sukeldumise andmete punkt</translation> </message> @@ -550,72 +565,72 @@ palun eemalda need esmalt.</translation> <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ügavus</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>Aeg</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>Rõhk</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>Temperatuur</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> @@ -623,67 +638,67 @@ palun eemalda need esmalt.</translation> <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>kuupäev</translation> </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>jalg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1300"/> + <location filename="../qt-ui/models.cpp" line="1317"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>lbs</source> <translation>nael</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1309"/> + <location filename="../qt-ui/models.cpp" line="1326"/> <source>suit</source> <translation>ülikond</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>ball</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>asukoht</translation> </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>Hapnikumürgistuse ühik (OTU)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1324"/> + <location filename="../qt-ui/models.cpp" line="1341"/> <source>maxCNS</source> <translation>maxCNS</translation> </message> @@ -691,43 +706,43 @@ palun eemalda need esmalt.</translation> <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>Vigane vastus serverilt</translation> </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>Oodatava XML märgendi 'DiveDateReader' asemel on '%1'</translation> </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>Oodatud XML märgendit 'DiveDates' ei leitud</translation> </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>Vigane XML vastus. Rida %1: %2</translation> </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> @@ -736,70 +751,70 @@ palun eemalda need esmalt.</translation> <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>Valmis</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>Sukeldumiste listi üleslaadimine...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>Sukeldumiste listi allalaadimine...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>Laen alla %1 sukeldumist...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>Allalaadimine lõppenud - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Vigane allalaadimine</translation> </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>Arhiivi ei saa avada: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>Üleslaadimine ebaõnnestus</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Üleslaadimine edukas</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>Sisselogimine ebaõnnestus</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>Ei suuda vastust tuvastada</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Viga: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Üleslaadimine lõppenud</translation> </message> @@ -922,7 +937,7 @@ palun eemalda need esmalt.</translation> <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>Toimeta valitud sukeldumiskohad</translation> </message> @@ -931,13 +946,13 @@ palun eemalda need esmalt.</translation> <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>Sukeldumise märkmed</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>Asukoht</translation> </message> @@ -963,13 +978,13 @@ palun eemalda need esmalt.</translation> </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>Õhu temp</translation> </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>Vee temp</translation> </message> @@ -995,7 +1010,7 @@ palun eemalda need esmalt.</translation> </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>Märkmed</translation> </message> @@ -1126,13 +1141,13 @@ palun eemalda need esmalt.</translation> <translation>Lisa raskuste süsteem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Väljasõidu koht</translation> </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>Väljasõidu märkmed</translation> </message> @@ -1147,61 +1162,61 @@ palun eemalda need esmalt.</translation> <translation>Loobu</translation> </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>Seda väljasõitu toimetatakse</translation> </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>Mitut sukeldumist toimetatakse</translation> </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>Seda sukeldumist toimetatakse.</translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>tundmatu</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> @@ -1209,109 +1224,109 @@ palun eemalda need esmalt.</translation> <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>Filter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>&Fail</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>&Logi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>&Vaade</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>&Abi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>&Import</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>&Uus logiraamat</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Uus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>&Ava logiraamat</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Ava</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>&Salvesta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Salvesta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Salvesta nimega</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>Ctrl+Shift+S</translation> </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>Sulge</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>Eksport &UDDF</translation> </message> @@ -1326,132 +1341,152 @@ palun eemalda need esmalt.</translation> <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>Ctrl+U</translation> </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>&Väljastus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>&Välju</translation> </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>Impordi &sukeldumiskompuutrist</translation> </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>Impordi &GPS andmed Subsurface teenusest</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>&Toimeta seadmete nimesid</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>&Nummerda ümber</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>Statistika &aastate kaupa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Sukeldumiste list</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Profiil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Kõik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>&Kasutusjuhend</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Maakera</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>P&laneeri sukeldumine</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>Import Divelogs.de-st</translation> </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>Ctrl+P</translation> </message> @@ -1474,11 +1509,12 @@ palun eemalda need esmalt.</translation> <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>...</translation> </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> @@ -1503,221 +1539,231 @@ palun eemalda need esmalt.</translation> <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>Eelistused</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Lisa sukeldumine</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Autogrupeerimine</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>CTRL+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>CTRL+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>Eelmine kompuuter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Vasak</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>Uus kompuuter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Parem</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Vali sündmused</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Sisesta plaan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>Subsurface kohta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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>Ava fail</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>Enne faili sulgemist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation> </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>Enne sukeldumise planeerimist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation> </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>Enne sukeldumise lisamist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation> </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>Soovid tehtud muudatused salvestada faili %1?</translation> </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>Soovid tehtud muudatused salvestada andmefaili?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Salvesta muudatused?</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>Muudatusi lähevad kaotsi kui neid ei salvestata.</translation> </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>Salvesta nimega</translation> </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>Hoiatus</translation> </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>Enne uue faili avamist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation> </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>UDDF failid (*.uddf *.UDDF)</translation> </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>Aasta statistika</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>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </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> @@ -1800,177 +1846,192 @@ palun eemalda need esmalt.</translation> <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>Süsteem</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>SI</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Briti/Ameerika</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Isikupärasta</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Sügavus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>meeter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>jalg</translation> </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>liiter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>kuupjalg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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>Süsteemi vaikeväärtus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Rõhk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Maht</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Temperatuur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Raskus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="465"/> + <location filename="../qt-ui/preferences.ui" line="492"/> <source>lbs</source> <translation>nael</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="507"/> <source>Time units</source> <translation>Ajaühikud</translation> </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>Laskumise/Tõusu kiiruse kordaja</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Minutid</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Sekundid</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Näita</translation> </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>GFlow max sügavusel</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Muu</translation> </message> @@ -1980,32 +2041,32 @@ palun eemalda need esmalt.</translation> <translation>Eelistused</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>Nõutav taaskäivitus</translation> </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>Uue keele kasutuselevõtuks tuleb Subsurface taaskäivitada.</translation> </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>Ava vaike logifail</translation> </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>Subsurface XML failid (*.ssrf *.xml *.XML)</translation> </message> @@ -2013,22 +2074,17 @@ palun eemalda need esmalt.</translation> <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>&Eelvaade</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>P&rindi</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>&Sulge</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Väljastus</translation> </message> @@ -2154,72 +2210,72 @@ palun eemalda need esmalt.</translation> <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>tundmatu</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>Sukeldumine #%1 - %2</translation> </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>Max sügavus: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Kestus: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Kasutatud gaas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>Max CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>Raskused:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Märkmed:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Semu:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Ülikond:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Nähtavus:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Hinne:</translation> </message> @@ -2227,40 +2283,75 @@ palun eemalda need esmalt.</translation> <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>Lisa gaasivahetus</translation> </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>Lisa järjehoidja</translation> </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>Eemalda sündmus</translation> </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>Peida sarnased sündmused</translation> </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>ÕHK</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>Eemalda see punkt</translation> </message> @@ -2270,22 +2361,22 @@ palun eemalda need esmalt.</translation> <translation>Sulge</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Keskmine</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Miinimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Maksimum</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>Liigu kaardil soovitud kohta ja märgi topeltklikiga sukeldumiskoht</translation> </message> @@ -2293,12 +2384,12 @@ palun eemalda need esmalt.</translation> <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>Nummerda ümber</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>Uus algusnumber</translation> </message> @@ -2306,52 +2397,52 @@ palun eemalda need esmalt.</translation> <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>Nihuta valitud sukeldumised</translation> </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>varasem</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>hilisem</translation> </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> @@ -2359,27 +2450,43 @@ palun eemalda need esmalt.</translation> <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>Nihuta valitud sukeldumised</translation> </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>Nihuta valitud sukeldumiste aega</translation> </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>t:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>varasem</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>hilisem</translation> </message> @@ -2415,42 +2522,42 @@ palun eemalda need esmalt.</translation> <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>Veebiteenus</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Ühendab...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>Allalaadimine lõppenud</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>Allalaadimise viga: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Viga ühendamisel:</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>Vale kasutaja ID!</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>Ei suuda vastust tuvastada</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Allalaadimine õnnestus!</translation> </message> @@ -2466,17 +2573,17 @@ palun eemalda need esmalt.</translation> <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>Kirjeldus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2489,6 +2596,49 @@ palun eemalda need esmalt.</translation> <translation>Info</translation> </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> @@ -2505,12 +2655,12 @@ palun eemalda need esmalt.</translation> <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>Kirjeldus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2544,11 +2694,16 @@ palun eemalda need esmalt.</translation> </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>Salasõna</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Üleslaadimine</translation> </message> @@ -2566,37 +2721,37 @@ palun eemalda need esmalt.</translation> <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>Tüüp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Raskus</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>Siin klikkamine kõrvaldab selle raskuste süsteemi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="442"/> + <location filename="../qt-ui/models.cpp" line="454"/> <source>lbs</source> <translation>nael</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="465"/> + <location filename="../qt-ui/models.cpp" line="478"/> <source>ft</source> <translation>jalg</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> @@ -2604,79 +2759,79 @@ palun eemalda need esmalt.</translation> <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>Aasta > Kuu / väljasõit</translation> </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>Kestus kokku</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> Keskmine</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> Lühim</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> Pikim</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Sügavus (%1) keskmine</translation> </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> Miinimum</translation> </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> Maksimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>SAC (%1) keskmine</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2686,72 +2841,72 @@ Maksimum</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="57"/> + <location filename="../dive.c" line="58"/> <source>pascal</source> <translation>paskal</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>kuupjalg</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>jalg</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>nael</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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) või (%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> @@ -2783,250 +2938,246 @@ Maksimum</translation> <translation>külgeriputatav</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>'%s' lugemine ebaõnnestus</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>CSV impordil on max toetatud veergude arv %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>mitte ükski</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>dekopeatus</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>tõus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>lagi</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>töökoormus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>saatja</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>rikkumine</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>järjehoidja</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>pind</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>ohutuspeatus</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>gaasivahetus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>ohutuspeatus (vabatahtlik)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>ohutuspeatus (kohustuslik)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>sügavpeatus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>lagi (ohutuspeatus)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>põhjaaeg</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>allpool taset</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>max sügavus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>Hapnikulimiidi osa (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>aeg õhuga</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>suund</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>koe taseme hoiatus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>mittepeatuste aeg</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>vale sündmuse nr</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>Ei saa luua parserit %s %s jaoks</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Viga andmete registreerimisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Viga kuupäeva ja aja tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Sukeldumine %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>Viga põhjaaja tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Viga max sügavuse tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Viga gaasisegude arvu tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Viga vee soolsuse saamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Viga pinnarõhu saamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Viga gaasisegu tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Viga proovide tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Sündmus: ootan kasutaja sekkumist</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>mudel=%u (0x%08x), püsivara=%u (0x%08x), seerianr=%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>Viga sündmuste draiveri registreerimisel.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Viga tühistamise draiveri registreerimisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Viga sukeldumise andmete impordil</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>Ei saa luua libdivecomputer konteksti</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Ei saa avada %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>Imelik protsendilugem %s @@ -3034,85 +3185,79 @@ Maksimum</translation> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>'%s' tuvastamine ebaõnnestus. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>'%s' tuvastamine ebaõnnestus</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>Andmebaasi päring get_events ebaõnnestus. </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>Andmebaasi ühendus ebaõnnestus '%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>Andmebaasi päring ebaõnnestus '%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>Ei leia gaasi %d/%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>Liiga palju gaasisegusid</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 @@ -3125,356 +3270,362 @@ põhineb väärtustel GFlow = %.0f ja 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>Üleminek %.*f %s %d:%02d min jooksul - käitusaeg %d:%02u on %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>Püsi %.*f %s peal %d:%02d min - jooksev aeg %d:%02u on %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Mine üle %s gaasile </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Gaasi tarbimine: </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>%sT: %d:%02d min</translation> </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>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 sukeldumist)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 sukeldumine)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>paat</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>kallas</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>hoovus</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>sügav</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>õõs</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>jää</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>vrakk</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>koobas</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>kõrgus</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>bassein</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>järv</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>jõgi</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>öö</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>magevesi</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>õpilane</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>foto</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>instruktor</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>deko</translation> </message> @@ -3524,97 +3675,97 @@ EADD: %d%s <translation>(pole sukeldumisi)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>Pühap</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Esmasp</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Teisip</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>Kolmap</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Neljap</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Reede</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>Laup</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Jaan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Veebr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Märts</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>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Juuni</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Juuli</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Sept</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Dets</translation> </message> diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts index 9716a55d1..59cb521cf 100644 --- a/translations/subsurface_fi_FI.ts +++ b/translations/subsurface_fi_FI.ts @@ -37,37 +37,42 @@ <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="158"/> + <location filename="../qt-ui/models.cpp" line="71"/> + <source>Switch at</source> + <translation>Vaihda syvyydessä</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="162"/> <source>Clicking here will remove this cylinder.</source> <translation>Poista säiliö.</translation> </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>Säiliötä ei voida poistaa</translation> </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>Tämä kaasu on käytössä. Vain säiliöt, joita ei käytetä sukelluksella, voidaan poistaa.</translation> </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>ft³</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>Muokkaa sukellustietokoneiden lempinimiä</translation> </message> @@ -95,22 +100,22 @@ poistaa valitun sukellustietokoneen?</translation> <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>Malli</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>Laite ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Lempinimi</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>Poista sukellustietokone.</translation> </message> @@ -118,28 +123,28 @@ poistaa valitun sukellustietokoneen?</translation> <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>ilma</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>EAN%1</translation> </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>Vaihto avoimeen ilman kiertoon</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>alku</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>loppu</translation> @@ -148,12 +153,12 @@ poistaa valitun sukellustietokoneen?</translation> <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>ilma</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>EAN%1</translation> </message> @@ -161,12 +166,12 @@ poistaa valitun sukellustietokoneen?</translation> <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>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation>jalkaa/min</translation> </message> @@ -174,112 +179,117 @@ poistaa valitun sukellustietokoneen?</translation> <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>Näytä hakukenttä</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>laajenna kaikki</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>supista kaikki</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>supista muut</translation> </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>erota sukellukset retkestä</translation> </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>luo uusi retki yläpuolelle</translation> </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>lisää sukellukset yläpuoliseen retkeen</translation> </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>lisää sukellukset alapuoliseen retkeen</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="749"/> <source>merge trip with trip above</source> <translation>liitä retki yllä olevaan retkeen</translation> </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>liitä retki alla olevaan retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>poista sukellukset</translation> </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>Merkitse sukellukset epäkelvoiksi</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>tallenna nimellä</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>vie UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>muuta aikoja</translation> </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"/> + <translation>lataa kuvat</translation> </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>lähetä sukellukset divelogs.de -sivustolle</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>Tallenna sukellukset nimellä...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Tallenna nimellä</translation> </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>UDDF -tiedostot (*.uddf *.UDDF)</translation> </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"/> + <translation>Avaa kuvatiedostot</translation> </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"/> + <translation>Kuvatiedostot (</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="760"/> <source>merge selected dives</source> <translation>yhdistä valitut sukellukset</translation> </message> @@ -289,17 +299,17 @@ poistaa valitun sukellustietokoneen?</translation> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="14"/> <source>Import dive log file</source> - <translation type="unfinished"/> + <translation>Liitä sukellusloki</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="36"/> <source>Import CSV Dive Log Files</source> - <translation type="unfinished"/> + <translation>Liitä CSV -muotoinen sukellusloki</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="50"/> <source>CSV options</source> - <translation type="unfinished"/> + <translation>CSV -asetukset</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="62"/> @@ -370,12 +380,12 @@ poistaa valitun sukellustietokoneen?</translation> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="278"/> <source>Manual dives</source> - <translation type="unfinished"/> + <translation>Vapaa CSV -tiedostosta tuonti</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="302"/> <source>Dive #</source> - <translation type="unfinished"/> + <translation>Sukellus</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="315"/> @@ -400,17 +410,17 @@ poistaa valitun sukellustietokoneen?</translation> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> <source>Gps</source> - <translation type="unfinished"/> + <translation>Gps</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="393"/> <source>Max depth</source> - <translation type="unfinished"/> + <translation>Suurin syvyys</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="406"/> <source>Mean depth</source> - <translation type="unfinished"/> + <translation>Keskisyvyys</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="419"/> @@ -469,22 +479,22 @@ poistaa valitun sukellustietokoneen?</translation> <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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30 jalkaa</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Virhe</translation> </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>Tämä toimenpide hävittää yhden tai useamman pysähdyksistäsi, @@ -494,37 +504,42 @@ poista ensin pysähdykset.</translation> <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>Ilma</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Lopullinen syvyys</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1087"/> + <location filename="../qt-ui/diveplanner.cpp" line="1154"/> + <source>Run time</source> + <translation>Kesto</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="1156"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Käytetty kaasuseos</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>CCR-asetuspiste</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation>Hylätäänkö suunnitelma?</translation> </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>Olet hylkäämässä suunnitelmasi.</translation> </message> @@ -532,17 +547,17 @@ poista ensin pysähdykset.</translation> <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>Sukellussuunnitelman etappipisteet</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>Mahdolliset kaasut</translation> </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>lisää sukellusetappi</translation> </message> @@ -550,72 +565,72 @@ poista ensin pysähdykset.</translation> <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>Syvyys</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>Kello</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>Paine</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>Lämpötila</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"/> + <translation>Väri</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <source>User Entered</source> + <translation>Käyttäjän syöttämä</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> - <source>User Entered</source> - <translation type="unfinished"/> + <source>Cylinder Index</source> + <translation>Säiliöindeksi</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> - <source>Cylinder Index</source> - <translation type="unfinished"/> + <source>Pressure S</source> + <translation>Sensoripaine</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> - <source>Pressure S</source> - <translation type="unfinished"/> + <source>Pressure I</source> + <translation>Arvioitu paine</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> - <source>Pressure I</source> - <translation type="unfinished"/> + <source>Ceiling</source> + <translation>Katto</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> - <source>Ceiling</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>SAC</source> <translation>Pintakulutus</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"/> + <translation>PN2</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>PHE</source> <translation>PHe</translation> </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> @@ -623,67 +638,67 @@ poista ensin pysähdykset.</translation> <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>päiväys</translation> </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>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>lbs</source> <translation>pauna</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1309"/> + <location filename="../qt-ui/models.cpp" line="1326"/> <source>suit</source> <translation>puku</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>säiliöt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>kohde</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1318"/> + <location filename="../qt-ui/models.cpp" line="1335"/> <source>SAC</source> <translation>Pintakulutus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1321"/> + <location filename="../qt-ui/models.cpp" line="1338"/> <source>OTU</source> <translation>Happikertymä</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1324"/> + <location filename="../qt-ui/models.cpp" line="1341"/> <source>maxCNS</source> <translation>maxCNS</translation> </message> @@ -691,44 +706,44 @@ poista ensin pysähdykset.</translation> <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>Virheellinen vastaus palvelimelta</translation> </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>Odotettu XML tägi on 'DiveDateReader', mutta saatiin '%1'</translation> </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>Odotettua XML -tägiä 'DiveDates' ei löydy</translation> </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>Virheellinen XML vastasu. Rivi %1: %2</translation> </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>sukelluksia ei ole valittu</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> - <translation>zip -tiedoston luonti vientiä varten epäonnistui: %1</translation> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/> + <source>failed to create zip file for upload: %s</source> + <translation>zip -tiedoston luonti vientiä varten epäonnistui: %s</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/> - <source>cannot create temporary file: %1</source> - <translation>väliaikaistiedoston luominen ei onnistu: %1</translation> + <source>cannot create temporary file: %s</source> + <translation>väliaikaistiedoston luominen ei onnistu: %s</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/> - <source>internal error: %1</source> - <translation>sisäinen virhe: %1</translation> + <source>internal error: %s</source> + <translation>sisäinen virhe: %s</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> @@ -736,70 +751,70 @@ poista ensin pysähdykset.</translation> <translation>sisäinen virhe</translation> </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>Valmis</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>Lähetetään sukelluslokia...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>Ladataan sukelluslokia...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>Ladataan %1 sukellusta...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>Lataus päättynyt - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Lataus on korruptoitunut</translation> </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>Pakattua tiedostoa ei voitu avata: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>Lähetys epäonnistui</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Lähetys onnistui</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>Kirjautuminen epäonnistui</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>Vastauksen jäsentäminen ei onnistu!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Virhe: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Lähetys valmistui</translation> </message> @@ -826,7 +841,7 @@ poista ensin pysähdykset.</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/> <source>Find Uemis dive computer</source> - <translation type="unfinished"/> + <translation>Etsi Uemis -sukellustietokone</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/> @@ -922,7 +937,7 @@ poista ensin pysähdykset.</translation> <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>Muokkaa valittuja sukelluskohteita</translation> </message> @@ -931,13 +946,13 @@ poista ensin pysähdykset.</translation> <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>Muistiinpanot</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>Kohde</translation> </message> @@ -963,13 +978,13 @@ poista ensin pysähdykset.</translation> </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>Ilman lämpötila</translation> </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>Veden lämpötila</translation> </message> @@ -995,7 +1010,7 @@ poista ensin pysähdykset.</translation> </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>Muistiinpanot</translation> </message> @@ -1126,13 +1141,13 @@ poista ensin pysähdykset.</translation> <translation>Lisää painojärjestelmä</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Matkakohde</translation> </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>Matkan muistiinpanot</translation> </message> @@ -1146,62 +1161,62 @@ poista ensin pysähdykset.</translation> <source>Cancel</source> <translation>Peruuta</translation> </message> - <message> - <location filename="../qt-ui/maintab.cpp" line="232"/> - <source>Air temp [%1]</source> - <translation type="unfinished"/> - </message> <message> <location filename="../qt-ui/maintab.cpp" line="233"/> - <source>Water temp [%1]</source> - <translation type="unfinished"/> + <source>Air temp [%1]</source> + <translation>Ilman lämpötila [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="234"/> + <source>Water temp [%1]</source> + <translation>Veden lämpötila [%1]</translation> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>This trip is being edited.</source> <translation>Tätä sukellusretkeä muokataan.</translation> </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>Muokataan useita sukelluksia.</translation> </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>Tätä sukellusta muokataan.</translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>tuntematon</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> @@ -1209,256 +1224,276 @@ poista ensin pysähdykset.</translation> <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>Suodattimet</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>Tiedosto</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>Loki</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>Näkymä</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>Apua</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>Liitä</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>Uusi loki</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Uusi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>Avaa loki</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Avaa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>Tallenna</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Tallenna</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Tallenna nimellä...</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>Ctrl+Shift+S</translation> </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>Sulje</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>Vie UDDF</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="138"/> <source>Enable the pN2 Graph</source> - <translation type="unfinished"/> + <translation>Näytä pN2 -kuvaaja</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="164"/> <source>Enable the pHe graph</source> - <translation type="unfinished"/> + <translation>Näytä pHe-kuvaaja</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="326"/> - <source>Enable EAD, END, and EADD</source> - <translation type="unfinished"/> + <location filename="../qt-ui/mainwindow.ui" line="300"/> + <source>Show/hide heart rate</source> + <translation>Näytä/piilota syke</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="352"/> + <source>Enable EAD, END, and EADD</source> + <translation>Näytä EAD, END ja EADD</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Show NDL / TTS</source> - <translation type="unfinished"/> + <translation>Näytä NDL / TTS</translation> </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"/> + <translation>Skaalaa syvyysakseli</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="681"/> + <location filename="../qt-ui/mainwindow.ui" line="709"/> <source>Ctrl+U</source> <translation>Ctrl+U</translation> </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>Vie maailmankartta (HTML)</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="717"/> + <source>Ctrl+H</source> + <translation>Ctrl+H</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="722"/> <source>&Print</source> <translation>Tulosta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>Lopeta</translation> </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>Hae sukellustietokoneelta</translation> </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>Liitä GPS-tiedot Subsurfacen on-line -palvelusta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>Muokkaa laitenimiä</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>Uudellennumeroi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>Vuositilastot</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Sukelluslista</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Profiilikuvaaja</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Tiedot</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Kaikki</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>Käyttöohje</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Maapallo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>Sukelluksen suunnittelu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>Tuo Divelogs.de -sivustolta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="689"/> + <location filename="../qt-ui/mainwindow.ui" line="945"/> + <source>&Check for Updates</source> + <translation>Tarkista päivitykset</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="112"/> <source>Enable the pO2 Graph</source> - <translation type="unfinished"/> + <translation>Näytä pO2 -kaavio</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="115"/> @@ -1474,252 +1509,263 @@ poista ensin pysähdykset.</translation> <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>...</translation> </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"/> + <translation>Näytä MOD</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="193"/> <source>Show the DC Reported Ceiling</source> - <translation type="unfinished"/> + <translation>Näytä sukellustietokoneen raportoima kattosyvyys</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="222"/> <source>Show the Calculated Ceiling</source> - <translation type="unfinished"/> + <translation>Näytä laskettu kattosyvyys</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="274"/> <source>Show Calculated Ceiling with 3m Increments</source> - <translation type="unfinished"/> + <translation>Näytä laskettu kattosyvyys 3m:n tarkkuudella</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="248"/> <source>Calculate All Tissues</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.ui" line="378"/> - <source>Show SAC Rate</source> - <translation type="unfinished"/> + <translation>Laske kaikki kudokset</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="404"/> - <source>Enable / Disable the Ruler</source> - <translation type="unfinished"/> + <source>Show SAC Rate</source> + <translation>Näytä hengitysnopeus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="430"/> + <source>Enable / Disable the Ruler</source> + <translation>Näytä / piilota viivain</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Preferences</source> <translation>Asetukset</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Lisää sukellus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Ryhmittele automaattisesti</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>Edellinen tietokone</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Vasen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>Seuraava tietokone</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Oikea</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Valitse tapahtumat</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Suunnittele</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>Tietoja Subsurfacesta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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"/> + <translation>Liitä lokitiedostoja</translation> </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"/> + <translation>Liitä lokitiedostoja toisesta sovelluksesta</translation> </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"/> + <translation>Kokoruututila</translation> </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"/> + <translation>Käytä kokoruututilaa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="884"/> + <location filename="../qt-ui/mainwindow.ui" line="920"/> <source>F11</source> - <translation type="unfinished"/> + <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="143"/> + <location filename="../qt-ui/mainwindow.cpp" line="173"/> <source>Open File</source> <translation>Avaa tiedosto</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>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen lokitiedoston sulkemista.</translation> </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>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus, ennen sukelluksen suunnittelua.</translation> </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>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen sukelluksen lisäystä.</translation> </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>Haluatko tallentaa muutoksesi tiedostoon %1?</translation> </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>Haluatko tallentaa muutoksesi tiedostoon?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Tallenna muutokset?</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>Muutokset hylätään, jos et tallenna niitä.</translation> </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>Tallenna nimellä</translation> </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>Varoitus</translation> </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>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen kuin avaat uuden lokin.</translation> </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>UDDF -tiedostot (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="395"/> + <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <source>Export World Map</source> + <translation>Vie maailmankartta</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="289"/> + <source>HTML files (*.html)</source> + <translation>HTML -tiedostot (*.html)</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="438"/> <source>Yearly Statistics</source> <translation>Vuositilastot</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>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation> </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"/> + <translation>Avaa sukellusloki</translation> </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"/> + <translation>Sukelluslokitiedostot (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML tiedostot (*.xml);;UDDF/UDCF tiedostot(*.uddf *.udcf);;JDiveLog tiedostot(*.jlb);;Suunto-lokit(*.sde *.db);;CSV Files(*.csv);;All Files(*)</translation> </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"/> + <translation>Ole hyvä ja lopeta nykyinen muokkaus ennen kuin aloitat uuden.</translation> </message> </context> <context> @@ -1737,7 +1783,7 @@ poista ensin pysähdykset.</translation> <message> <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> - <translation>Kuvaaja</translation> + <translation>Kaavio</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="115"/> @@ -1792,185 +1838,200 @@ poista ensin pysähdykset.</translation> <message> <location filename="../qt-ui/preferences.ui" line="237"/> <source>Animations</source> - <translation type="unfinished"/> + <translation>Animaatiot</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="243"/> <source>Speed</source> - <translation type="unfinished"/> + <translation>Nopeus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="289"/> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> + <translation>Subsurfacen verkkopalvelu</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="276"/> + <source>Default User ID</source> + <translation>Oletuskäyttäjätunnus</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="287"/> + <source>Save User ID locally?</source> + <translation>Tallennetaanko käyttäjätunnus paikallisesti?</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>System</source> <translation>Järjestelmä</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Metrinen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Brittiläinen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Mukauta</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Syvyys</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>metri</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>jalka</translation> </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>litra</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>kuutiojalka</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>Celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>Fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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"/> + <translation>kynnysarvo pO₂:lle</translation> </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"/> + <translation>kynnysarvo pN₂:lle</translation> </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"/> + <translation>kynnysarvo pHe:lle</translation> </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"/> + <translation>maksimi ppO₂, kun näytetään MOD</translation> </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"/> + <translation>Näytä sukellustietokoneen raportoima kattosyvyys punaisella</translation> </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>Järjestelmän oletus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Suodattimet</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Paine</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Tilavuus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Lämpötila</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Painot</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="465"/> + <location filename="../qt-ui/preferences.ui" line="492"/> <source>lbs</source> <translation>pauna</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="507"/> <source>Time units</source> <translation>Aikayksiköt</translation> </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>Nousu/laskunopeuden yksikkö</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Minuuttia</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Sekuntia</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Näytä</translation> </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>Näytä käyttämättömät säiliöt varusteluettelossa</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="679"/> + <source>show average depth</source> + <translation>näytä keskisyvyys</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="731"/> <source>GFLow at max depth</source> <translation>GFLow maksimisyvyydessä</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Sekalaiset</translation> </message> @@ -1980,33 +2041,33 @@ poista ensin pysähdykset.</translation> <translation>Asetukset</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GFlow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GFhigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>Vaaditaan uudelleenkäynnistys</translation> </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>Uuden kielen lataaminen vaatii Subsurfacen uudelleenkäynnistyksen </translation> </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>Avaa oletustiedosto</translation> </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>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation> </message> @@ -2014,22 +2075,17 @@ poista ensin pysähdykset.</translation> <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>Esikatselu</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>Tulosta</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>Sulje</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Tulosta</translation> </message> @@ -2155,72 +2211,72 @@ poista ensin pysähdykset.</translation> <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>tuntematon</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>Sukellus #%1 - %2</translation> </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>Suurin syvyys: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Kesto: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Kaasu:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>Pintakulutus:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>Max CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>Painot:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Muistiinpanot:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Sukellusvanhin:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Sukelluspari:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Puku:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Näkyvyys:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Yleisarvio:</translation> </message> @@ -2228,40 +2284,75 @@ poista ensin pysähdykset.</translation> <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>Lisää kaasun vaihto</translation> </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>Lisää kirjanmerkki</translation> </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>Poista tapahtuma</translation> </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>Piilota samankaltaiset tapahtumat</translation> </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>Muokkaa nimeä</translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="733"/> <source>Unhide all events</source> <translation>Näytä kaikki tapahtumat</translation> </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="746"/> + <source>Hide events</source> + <translation>Piilota tapahtumat</translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="746"/> + <source>Hide all %1 events?</source> + <translation>Piilota kaikki %1 tapahtumat</translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="776"/> + <source>Remove the selected event?</source> + <translation>Poistetaanko valitut tapahtumat?</translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="777"/> + <source>%1 @ %2:%3</source> + <translation>%1 @ %2:%3</translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="832"/> + <source>Edit name of bookmark</source> + <translation>Muokkaa kirjanmerkin nimeä</translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="833"/> + <source>Custom name:</source> + <translation>Valinnainen nimi:</translation> + </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>Ilma</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>Poista tämä etappi</translation> </message> @@ -2271,22 +2362,22 @@ poista ensin pysähdykset.</translation> <translation>Sulje</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Keskim.</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Alin</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Korkein</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>Kaksoisnäpäytä karttaa valitaksesi sukelluskohteen</translation> </message> @@ -2294,12 +2385,12 @@ poista ensin pysähdykset.</translation> <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>Uudellennumeroi</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>Uusi aloitusnumero</translation> </message> @@ -2307,80 +2398,96 @@ poista ensin pysähdykset.</translation> <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>Muuta valittujen aikaa</translation> </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"/> + <translation>Siirrä kuvien aikaleimaa:</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="99"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="102"/> <source>earlier</source> <translation>aiemmin</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>myöhemmin</translation> </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"/> - <source>Determine camera time offset</source> - <translation type="unfinished"/> + <translation>Laskeaksesi kameran ja sukellustietokoneen kellojen aikaeron, ota kuva sukellustietokoneestasi, lataa tämä kuva ja paina tätä painiketta.</translation> </message> <message> <location filename="../qt-ui/shiftimagetimes.ui" line="155"/> + <source>Determine camera time offset</source> + <translation>Määritä kameran kellon aika</translation> + </message> + <message> + <location filename="../qt-ui/shiftimagetimes.ui" line="158"/> <source>Select image of divecomputer showing time</source> - <translation type="unfinished"/> + <translation>Valitse kuva, joka näyttää sukellustietokoneen kellonajan</translation> </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"/> + <translation>Mikä päivä ja aika näkyy kuvassa?</translation> </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"/> + <translation>Avaa kuvatiedosto</translation> </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"/> + <translation>Kuvatiedostot (</translation> </message> </context> <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>Muuta valittujen aikaa</translation> </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>Muuta valittujen sukellusten aikaa</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="73"/> + <location filename="../qt-ui/shifttimes.ui" line="72"/> + <source>Shifted time:</source> + <translation>Muutetut ajat:</translation> + </message> + <message> + <location filename="../qt-ui/shifttimes.ui" line="79"/> + <source>Current time:</source> + <translation>Nykyinen aika:</translation> + </message> + <message> + <location filename="../qt-ui/shifttimes.ui" line="86"/> + <location filename="../qt-ui/shifttimes.ui" line="93"/> + <source>0:0</source> + <translation>0:0</translation> + </message> + <message> + <location filename="../qt-ui/shifttimes.ui" line="126"/> <source>h:mm</source> <translation>h:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>aiemmin</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>myöhemmin</translation> </message> @@ -2410,48 +2517,48 @@ poista ensin pysähdykset.</translation> <message> <location filename="../qt-ui/about.cpp" line="12"/> <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation type="unfinished"/> + <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Sukelluslokiohjelmisto useille käyttöjärjestelmäalustoille<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></translation> </message> </context> <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>Verkkopalvelu</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Yhdistetään...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>Lataus valmistui</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>Virhe latauksessa: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Yhteysvirhe:</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>Tuntematon käyttäjä!</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>Vastauksen jäsentäminen ei onnistu!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Lataus onnistui!</translation> </message> @@ -2467,17 +2574,17 @@ poista ensin pysähdykset.</translation> <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>Kuvaus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2490,6 +2597,49 @@ poista ensin pysähdykset.</translation> <translation>Tiedot</translation> </message> </context> +<context> + <name>UpdateManager</name> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="36"/> + <source>Check for updates.</source> + <translation>Tarkista päivitykset.</translation> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="37"/> + <source><h3>Subsurface was unable to check for updates.</h3></source> + <translation><h3>Päivitysten tarkistus epäonnistui.</h3></translation> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="42"/> + <source><br/><b>The following error occurred:</b><br/></source> + <translation><br/><b>Tapahtui seuraava virhe:</b><br/></translation> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="43"/> + <source><br/><br/><b>Please check your internet connection.</b></source> + <translation><br/><br/><b>Tarkista Internet-yhteytesi.</b></translation> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="52"/> + <source>You are using the latest version of subsurface.</source> + <translation>Käytössä on uusin versio Subsurfacesta.</translation> + </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>Saatavilla on uusi versio Subsurfacesta.<br/>Näpäytä:<br/><a href="%1">%1</a><br/> ladataksesi sen.</translation> + </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><b>Saatavilla on uusi versio Subsurfacesta.</b><br/><br/>%1</translation> + </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>Päivitysten tarkastuksssa tapahtui virhe.<br/><br/>%1</translation> + </message> +</context> <context> <name>UserManual</name> <message> @@ -2506,12 +2656,12 @@ poista ensin pysähdykset.</translation> <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>Kuvaus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2545,11 +2695,16 @@ poista ensin pysähdykset.</translation> </message> <message> <location filename="../qt-ui/webservices.ui" line="85"/> + <source>Save User ID locally?</source> + <translation>Tallennetaanko käyttäjätunnus paikallisesti?</translation> + </message> + <message> + <location filename="../qt-ui/webservices.ui" line="92"/> <source>Password</source> <translation>Salasana</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Lähetä</translation> </message> @@ -2567,37 +2722,37 @@ poista ensin pysähdykset.</translation> <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>Tyyppi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Painot</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>Poista painojärjestelmä näpäyttämällä ikonia.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="442"/> + <location filename="../qt-ui/models.cpp" line="454"/> <source>lbs</source> <translation>pauna</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> @@ -2605,79 +2760,79 @@ poista ensin pysähdykset.</translation> <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>Vuosi > Kuukausi / Retki</translation> </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>Kesto Kokonais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> Keskim.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> Lyhin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> Pisin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Dyvyys (%1) Keski</translation> </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> Alin</translation> </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> Suurin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Keski</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Lämpö (%1) @@ -2687,72 +2842,72 @@ Keski</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="57"/> + <location filename="../dive.c" line="58"/> <source>pascal</source> <translation>Pa</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>ft³</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>pauna</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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) tai (%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> @@ -2784,250 +2939,246 @@ Keski</translation> <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>Tiedoston '%s' avaaminen epäonnistui</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>Maksimimäärä sarakkeita CSV -tuonnissa on %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>ei mitään</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>deko-pysähdys</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>pohja-aika</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>nousu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>katto</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>työmäärä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>lähetin</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>rike</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>kirjanmerkki</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>pinta</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>turvapysähdys</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>Kaasun vaihto</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>turvapysähdys (vapaaehtoinen)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>turvapysähdys (pakollinen)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>syväpysähdys</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>katto (turvapysähdys)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>sukellusaika</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>liian syvällä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Suurin syvyys</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>Happikertymä</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>Ilma-aika</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>suunta</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>kudoskertymän varoitus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>keskeytyksetön aika</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>tuntematon tapahtumanumero</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>Jäsentäjän luominen %s %s epäonnistui</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Virhe tiedon rekisteröinnissä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Virhe ajan jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Sukellus %1$d: %3$d. %2$skuuta %4$04d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="438"/> + <location filename="../libdivecomputer.c" line="440"/> <source>Error parsing the divetime</source> <translation>Virhe sukelluksen keston jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Virhe maksimisyvyyden jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Virhe kaasuseosten määrän jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Virhe veden suolapitoisuuden määrityksessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Virhe ilmanpaineen määrityksessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Virhe kaasuseoksen jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Virhe näytteiden tulkinnassa</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Tapahtuma: odotetaan käyttäjän toimia</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>malli=%u (0x%08x), firmware=%u (0x%08x), sarjanumero=%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>Virhe tapahtumakäsittelijän rekisteröinnissä.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Virhe perumiskäsittelijän rekisteröinnissä.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Virhe sukellusten jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>libdivecomputer-kontekstin luominen epäonnistui</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Avaaminen epäonnistui: %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>Outo prosenttiosuus: %s @@ -3035,85 +3186,83 @@ Keski</translation> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Tiedoston '%s' lukeminen epäonnistui. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Tiedoston '%s' lukeminen epäonnistui.</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>Tietokantakysely 'get_events' (nouda tapahtumat) epäonnistui. </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"/> + <translation>Tietokantakysely 'get_tags' epäonnistui. +</translation> </message> <message> - <location filename="../file.c" line="176"/> + <location filename="../file.c" line="166"/> <source>Database connection failed '%s'. </source> <translation>Tietokantayhteys epäonnistui '%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>Tietokantakysely epäonnistui '%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"/> + <translation>Tietokantakysely 'get_cylinders' epäonnistui. +</translation> </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"/> + <translation>Tietokantakysely 'get_changes' epäonnistui. +</translation> </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"/> + <translation>Tietokantakysely 'get_profile_sample' epäonnistui. +</translation> </message> <message> - <location filename="../parse-xml.c" line="2102"/> + <location filename="../parse-xml.c" line="2103"/> <source>Can't open stylesheet %s</source> <translation>Tyylitiedoston %1 avaus ei onnistu</translation> </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>Seosta %d/%d ei löydy</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>Liian monta kaasuseosta</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 @@ -3126,357 +3275,391 @@ perustuu arvoihin GFlow = %.0f ja 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>Siirtymä %.*f %s:n syvyyteen ajassa %d:%02d - aika %d:%02u kaasulla %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>Pysy %.*f %s:n syvyydessä %d:%02d min - aika %d:%02u kaasulla %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Vaihda kaasu seuraavaan: %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Kaasun kulutus: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f %s (%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"/> + <translation>@: %d:%02d +S: %.1f%s +</translation> </message> <message> - <location filename="../profile.c" line="1234"/> + <location filename="../profile.c" line="1229"/> <source>P: %d%s </source> - <translation type="unfinished"/> + <translation>P: %d%s +</translation> </message> <message> - <location filename="../profile.c" line="1238"/> + <location filename="../profile.c" line="1233"/> <source>T: %.1f%s </source> - <translation type="unfinished"/> + <translation>L: %.1f%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1239"/> + <source>V: %.1f%s +</source> + <translation>N: %.1f%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1242"/> + <source>SAC: %2.1fl/min +</source> + <translation>SAC: %2.1fl/min +</translation> </message> <message> <location filename="../profile.c" line="1244"/> - <source>V: %.1f%s -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1247"/> - <source>SAC: %2.1fl/min -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1249"/> <source>CNS: %u%% </source> - <translation type="unfinished"/> + <translation>CNS: %u%% +</translation> </message> <message> - <location filename="../profile.c" line="1251"/> + <location filename="../profile.c" line="1246"/> <source>pO%s: %.2fbar </source> - <translation type="unfinished"/> + <translation>pO%s: %.2fbar +</translation> + </message> + <message> + <location filename="../profile.c" line="1248"/> + <source>pN%s: %.2fbar +</source> + <translation>pN%s: %.2fbar +</translation> + </message> + <message> + <location filename="../profile.c" line="1250"/> + <source>pHe: %.2fbar +</source> + <translation>pHe: %.2fbar +</translation> </message> <message> <location filename="../profile.c" line="1253"/> - <source>pN%s: %.2fbar -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1255"/> - <source>pHe: %.2fbar -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1258"/> <source>MOD: %d%s </source> - <translation type="unfinished"/> + <translation>MOD: %d%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1260"/> + <source>EAD: %d%s +EADD: %d%s +</source> + <translation>EAD: %d%s +EADD: %d%s +</translation> </message> <message> <location filename="../profile.c" line="1264"/> - <source>EAD: %d%s -END: %d%s + <source>END: %d%s EADD: %d%s </source> - <translation type="unfinished"/> + <translation>END: %d%s +EADD: %d%s +</translation> </message> <message> - <location filename="../profile.c" line="1271"/> + <location filename="../profile.c" line="1276"/> <source>Safetystop: %umin @ %.0f%s </source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1274"/> - <source>Safetystop: unkn time @ %.0f%s -</source> - <translation type="unfinished"/> + <translation>Turvapysähdys: %umin @ %.0f%s +</translation> </message> <message> <location filename="../profile.c" line="1279"/> + <source>Safetystop: unkn time @ %.0f%s +</source> + <translation>Turvapysähdys: ajankohta? @ %.0f%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1284"/> <source>Deco: %umin @ %.0f%s </source> - <translation type="unfinished"/> + <translation>Deko: %umin @ %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1282"/> + <location filename="../profile.c" line="1287"/> <source>Deco: unkn time @ %.0f%s </source> - <translation type="unfinished"/> + <translation>Deko: ajankohta? @ %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1286"/> + <location filename="../profile.c" line="1291"/> <source>In deco </source> - <translation type="unfinished"/> + <translation>Dekossa</translation> </message> <message> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1293"/> <source>NDL: %umin </source> - <translation type="unfinished"/> + <translation>NDL: %umin +</translation> </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"/> - <source>In deco (calc) -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1302"/> - <source>NDL: %umin (calc) -</source> - <translation type="unfinished"/> + <translation>Deko: %umin @ %.0f%s (lask.) +</translation> </message> <message> <location filename="../profile.c" line="1305"/> + <source>In deco (calc) +</source> + <translation>Dekossa (lask.) +</translation> + </message> + <message> + <location filename="../profile.c" line="1307"/> + <source>NDL: %umin (calc) +</source> + <translation>NDL: %umin (calc) +</translation> + </message> + <message> + <location filename="../profile.c" line="1310"/> <source>TTS: %umin (calc) </source> - <translation type="unfinished"/> + <translation>TTS: %umin (calc) +</translation> </message> <message> - <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1313"/> <source>Calculated ceiling %.0f%s </source> - <translation type="unfinished"/> + <translation>Laskettu katto %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1314"/> + <location filename="../profile.c" line="1319"/> <source>Tissue %.0fmin: %.0f%s </source> - <translation type="unfinished"/> + <translation>Kudos %.0fmin: %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1320"/> + <location filename="../profile.c" line="1325"/> <source>heartbeat: %d </source> - <translation type="unfinished"/> + <translation>syke: %d +</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1327"/> <source>bearing: %d </source> - <translation type="unfinished"/> + <translation>suunta: %d +</translation> </message> <message> - <location filename="../profile.c" line="1414"/> + <location filename="../profile.c" line="1419"/> <source>%sT: %d:%02d min</source> <translation>%sA: %d:%02d min</translation> </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>%s %sS:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sS:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sN:%.2f%s</translation> </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>%s %sN:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %3.%2.%4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%2.%1.%3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 dives)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 dive)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>vene</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>ranta</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>virta</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>syvä</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>luola (cavern)</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>jää</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>hylky</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>luola</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>korkeus</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>uima-allas</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>järvi</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>joki</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>yö</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>makea</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>oppilas</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>valokuva</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>kouluttaja</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>deko</translation> </message> @@ -3526,97 +3709,97 @@ EADD: %d%s <translation>(ei sukelluksia)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>su</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>ma</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>ti</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>ke</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>to</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>pe</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>la</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>tammi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>helmi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>maalis</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Apr</source> <translation>huhti</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>May</source> <translation>touko</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>kesä</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>heinä</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>elo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>syys</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>loka</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>marras</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>joulu</translation> </message> diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index 76a182e3d..18ba01eac 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -37,37 +37,42 @@ <translation>O</translation> </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>Cliquer ici retirera ce bloc.</translation> </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>Le bloc ne peut être retiré.</translation> </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>Ce gaz est utilisé. Seuls les blocs qui ne sont pas utilisés dans la plongée peuvent être retirés.</translation> </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>pied³</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>Modifier le nom de l'ordinateur de plongée</translation> </message> @@ -95,22 +100,22 @@ l'ordinateur de plongée sélectionné ?</translation> <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>Modèle</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>Identifiant du périphérique</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Nom</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>Cliquer ici retirera cet ordinateur de plongée.</translation> </message> @@ -118,28 +123,28 @@ l'ordinateur de plongée sélectionné ?</translation> <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>air</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>EAN%1</translation> </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>Passer en CO</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> début</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> fin</translation> @@ -148,12 +153,12 @@ l'ordinateur de plongée sélectionné ?</translation> <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>air</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>EAN%1</translation> </message> @@ -161,12 +166,12 @@ l'ordinateur de plongée sélectionné ?</translation> <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>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation> cuft/min</translation> </message> @@ -174,112 +179,117 @@ l'ordinateur de plongée sélectionné ?</translation> <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>Montrer la barre de recherche</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>tout déplier</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>tout replier</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>replier les autres</translation> </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>retirer plongée(s) du groupe</translation> </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>créer un nouveau groupe au-dessus</translation> </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>ajouter plongée(s) au groupe immédiatement au-dessus</translation> </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>fusionner le groupe avec le groupe au-dessus</translation> </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>fusionner le groupe avec le groupe au dessous</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>supprimer plongée(s)</translation> </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>marquer la/les plongée(s) comme invalides</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>Enregistrer sous</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>Exporter comme un fichier UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>décaler l'heure</translation> </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>Télécharger la/les plongée(s) vers divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>Enregistrer les plongées sous...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Enregistrer le fichier sous</translation> </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>Fichiers UDDF (*.uddf *.UDDF)</translation> </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"/> + <translation>Ouvrir un fichier image</translation> </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>fusionner les plongées sélectionnées</translation> </message> @@ -289,17 +299,17 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="14"/> <source>Import dive log file</source> - <translation type="unfinished"/> + <translation>Importer des plongées depuis un fichier</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="36"/> <source>Import CSV Dive Log Files</source> - <translation type="unfinished"/> + <translation>Importer des plongées depuis un fichier CSV</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="50"/> <source>CSV options</source> - <translation type="unfinished"/> + <translation>Options CSV</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="62"/> @@ -375,7 +385,7 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="302"/> <source>Dive #</source> - <translation type="unfinished"/> + <translation>Plongée n°</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="315"/> @@ -400,17 +410,17 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> <source>Gps</source> - <translation type="unfinished"/> + <translation>Gps</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="393"/> <source>Max depth</source> - <translation type="unfinished"/> + <translation>Profondeur max.</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="406"/> <source>Mean depth</source> - <translation type="unfinished"/> + <translation>Profondeur moy.</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="419"/> @@ -469,22 +479,22 @@ l'ordinateur de plongée sélectionné ?</translation> <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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Gestion des positions problématiques</translation> </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>Un ou plusieurs paliers seront perdus avec ces opérations, @@ -494,37 +504,42 @@ Veuillez d'abord les supprimer.</translation> <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>AIR</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Profondeur Finale</translation> </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>Durée</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Gaz Utilisé</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>Recycleur</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation>Annuler la planification ?</translation> </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>Vous allez annuler la planification.</translation> </message> @@ -532,17 +547,17 @@ Veuillez d'abord les supprimer.</translation> <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>Point planifiés</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>Gaz disponibles</translation> </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>Ajouter un point de donnée</translation> </message> @@ -550,72 +565,72 @@ Veuillez d'abord les supprimer.</translation> <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>Profondeur</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>Temps</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>Pression</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>Température</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"/> + <translation>Couleur</translation> </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>Consommation d'air</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"/> + <translation>Pn2</translation> </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> @@ -623,67 +638,67 @@ Veuillez d'abord les supprimer.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1288"/> + <location filename="../qt-ui/models.cpp" line="1305"/> <source>#</source> <translation>N°</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1291"/> + <location filename="../qt-ui/models.cpp" line="1308"/> <source>date</source> <translation>date</translation> </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>pied</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1300"/> + <location filename="../qt-ui/models.cpp" line="1317"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>lbs</source> <translation>livre US</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1309"/> + <location filename="../qt-ui/models.cpp" line="1326"/> <source>suit</source> <translation>combinaison</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>blk</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>lieu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1318"/> + <location filename="../qt-ui/models.cpp" line="1335"/> <source>SAC</source> <translation>Consommation d'air</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>SNCmax</translation> </message> @@ -691,44 +706,44 @@ Veuillez d'abord les supprimer.</translation> <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>Réponse invalide du serveur</translation> </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>Le tag XML 'DiveDateReader' est attendu, '%1' a été lu</translation> </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>Le tag XML 'DiveDates' n'a pas été trouvé</translation> </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>Réponse XML mal formée. Ligne %1: %2</translation> </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>Aucune plongée sélectionnée</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> - <translation>Erreur de création du fichier zip pour téléchargement : %1</translation> + <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> - <translation>Impossible de créer le fichier temporaire : %1</translation> + <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> - <translation>Erreur interne : %1</translation> + <source>internal error: %s</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> @@ -736,70 +751,70 @@ Veuillez d'abord les supprimer.</translation> <translation>Erreur interne</translation> </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>Terminé</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>Téléchargement de la liste des plongées</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>Téléchargement de la liste des plongées</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>%1 plongées en cours de téléchargement</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>Téléchargement terminé - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Téléchargement corrompu</translation> </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>L'archive ne peut pas être ouverte: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>Echec du téléchargement</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Téléchargement terminé avec succès</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>Echec de connexion</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>Impossible d'analyser la réponse</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Erreur: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Téléchargement terminé</translation> </message> @@ -922,7 +937,7 @@ Veuillez d'abord les supprimer.</translation> <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>Modifier le lieu de la plongée sélectionnée</translation> </message> @@ -931,13 +946,13 @@ Veuillez d'abord les supprimer.</translation> <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>Notes de plongée</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>Lieu</translation> </message> @@ -963,13 +978,13 @@ Veuillez d'abord les supprimer.</translation> </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>Temp. air</translation> </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>Temp. eau</translation> </message> @@ -995,7 +1010,7 @@ Veuillez d'abord les supprimer.</translation> </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>Notes</translation> </message> @@ -1126,13 +1141,13 @@ Veuillez d'abord les supprimer.</translation> <translation>Ajouter un système de poids</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Lieu du groupe</translation> </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>Notes du groupe</translation> </message> @@ -1147,61 +1162,61 @@ Veuillez d'abord les supprimer.</translation> <translation>Annuler</translation> </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>Ce groupe est en train d'être édité.</translation> </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>Plusieurs plongées sont en train d'être éditées.</translation> </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>Cette plongée est en train d'être éditée.</translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>inconnu</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>O</translation> </message> @@ -1209,109 +1224,109 @@ Veuillez d'abord les supprimer.</translation> <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>Filtrer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>&Fichier</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>&Journal</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>&Vue</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>&Aide</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>&Importer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>&Nouveau carnet de plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Nouveau</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>&Ouvrir un carnet de plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Ouvrir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>Enregistrer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Sauvegarder</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Enregistrer sous</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>Ctrl+Maj+S</translation> </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>Fermer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>Exporter &UDDF</translation> </message> @@ -1326,132 +1341,152 @@ Veuillez d'abord les supprimer.</translation> <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>Ctrl+U</translation> </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>&Imprimer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>&Quitter</translation> </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>Importer depuis l'&ordinateur de plongée</translation> </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>Importer les données &GPS depuis le service Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>&Modifier le nom du périphérique</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>&Renuméroter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>&Statistiques annuelles</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Liste de plongées</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Informations</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Tout</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>Manuel d'utilisation</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Globe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>P&lannification de plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>Importer depuis divelogs.de</translation> </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>Ctrl+P</translation> </message> @@ -1474,11 +1509,12 @@ Veuillez d'abord les supprimer.</translation> <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>...</translation> </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> @@ -1503,221 +1539,231 @@ Veuillez d'abord les supprimer.</translation> <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>Préférences</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Ajouter une plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Groupement automatique</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>Ordinateur précédent</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Gauche</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>Ordinateur suivant</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Droite</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Sélection des événements</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Saisir le plan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>À propos de Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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>Ouvrir un Fichier</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>Veuillez enregistrer ou annuler vos modifications en cours avant de fermer le fichier.</translation> </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>Veuillez enregistrer ou annuler vos modifications en cours avant de démarrer une planification.</translation> </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>Veuillez enregistrer ou annuler vos modifications en cours avant d'ajouter une nouvelle plongée.</translation> </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>Voulez-vous enregistrer les modifications du fichier %1 ?</translation> </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>Voulez-vous enregistrer les modifications du fichier de données ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Enregistrement des changements ?</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>Les modifications seront perdues si vous ne les enregistrez pas.</translation> </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>Enregistrer le fichier sous</translation> </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>Avertissement</translation> </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>Veuillez enregistrer ou annuler vos modifications en cours avant d'ouvrir un nouveau fichier.</translation> </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>Fichiers UDDF (*.uddf *.UDDF)</translation> </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>Statistiques annuelles</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>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation> </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> @@ -1792,185 +1838,200 @@ Veuillez d'abord les supprimer.</translation> <message> <location filename="../qt-ui/preferences.ui" line="237"/> <source>Animations</source> - <translation type="unfinished"/> + <translation>Animations</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="243"/> <source>Speed</source> + <translation>Vitesse</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="289"/> + <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>Système</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Métrique</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Impérial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Personnalisé</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Profondeur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>mètre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>pied</translation> </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>litre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>pied cubique</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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>Paramètre par défaut</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Filtrer</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Pression</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Température</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Poids</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="465"/> + <location filename="../qt-ui/preferences.ui" line="492"/> <source>lbs</source> <translation>livre US</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="507"/> <source>Time units</source> <translation>Unités de temps</translation> </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>Dénominateur de vitesse de montée/descente</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Minutes</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Secondes</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Montrer</translation> </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>GFLow à la profondeur max</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Divers</translation> </message> @@ -1980,32 +2041,32 @@ Veuillez d'abord les supprimer.</translation> <translation>Préférences</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>Redémarrage necessaire</translation> </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>Vous devez redémarrer Subsurface pour prendre en compte la nouvelle langue.</translation> </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>Ouvrir le fichier de plongée par défaut</translation> </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>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> @@ -2013,22 +2074,17 @@ Veuillez d'abord les supprimer.</translation> <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>&Prévisualisation</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>&Impression</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>&Fermer</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Imprimer</translation> </message> @@ -2154,72 +2210,72 @@ Veuillez d'abord les supprimer.</translation> <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>inconnu</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>Plongée #%1 - %2</translation> </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>Profondeur max: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Durée: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Gaz utilisé:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>Consommation d'air:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>SNC Max.:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>Poids:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Notes:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Chef de palanquée:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Binôme:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Combinaison:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Visi:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Évaluation:</translation> </message> @@ -2227,40 +2283,75 @@ Veuillez d'abord les supprimer.</translation> <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>Ajouter un changement de mélange</translation> </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>Ajouter un signet</translation> </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>Supprimer l'événement</translation> </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>Cacher les événements similaires</translation> </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>Dé-sélectionner tous les évènements</translation> </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>AIR</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>Supprimer ce point</translation> </message> @@ -2270,22 +2361,22 @@ Veuillez d'abord les supprimer.</translation> <translation>Fermer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Moyenne</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Maximum</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>Déplacez la carte et double cliquez pour définir le lieu de la plongée</translation> </message> @@ -2293,12 +2384,12 @@ Veuillez d'abord les supprimer.</translation> <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>Renuméroter</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>Nouveau numéro de départ</translation> </message> @@ -2306,52 +2397,52 @@ Veuillez d'abord les supprimer.</translation> <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>Décaler l'heure</translation> </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>plus tôt</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>plus tard</translation> </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> @@ -2359,27 +2450,43 @@ Veuillez d'abord les supprimer.</translation> <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>Décaler l'heure</translation> </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>Décaler les heures des plongées sélectionnées de</translation> </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>h:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>plus tôt</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>plus tard</translation> </message> @@ -2415,42 +2522,42 @@ Veuillez d'abord les supprimer.</translation> <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>Serveur</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Connexion en cours...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>Téléchargement terminé</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>Erreur de téléchargement: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Erreur de connexion : </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>Identifiant utilisateur incorrect.</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>Impossible de lire la réponse</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éléchargement réussi</translation> </message> @@ -2466,17 +2573,17 @@ Veuillez d'abord les supprimer.</translation> <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>Description</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2489,6 +2596,49 @@ Veuillez d'abord les supprimer.</translation> <translation>Information</translation> </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> @@ -2505,12 +2655,12 @@ Veuillez d'abord les supprimer.</translation> <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>Description</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2544,11 +2694,16 @@ Veuillez d'abord les supprimer.</translation> </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>Mot de passe</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Envoyer</translation> </message> @@ -2566,37 +2721,37 @@ Veuillez d'abord les supprimer.</translation> <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>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Poids</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>Cliquer ici retirera ce système de poids.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="442"/> + <location filename="../qt-ui/models.cpp" line="454"/> <source>lbs</source> <translation>livre US</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="465"/> + <location filename="../qt-ui/models.cpp" line="478"/> <source>ft</source> <translation>pied</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> @@ -2604,79 +2759,79 @@ Veuillez d'abord les supprimer.</translation> <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>Année > Mois / Groupe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1659"/> <source>#</source> <translation>N°</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1662"/> <source>Duration Total</source> <translation>Durée Totale</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> Moyenne</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> Plus courte</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> Plus longue</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Pronfondeur (%&) Moyenne</translation> </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> Minimum</translation> </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> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Moyenne</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2686,72 +2841,72 @@ Moyenne</translation> <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>pied³</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>pied</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>livre US</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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) ou (%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> @@ -2783,250 +2938,246 @@ Moyenne</translation> <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>Impossible de la lecture « %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>Le nombre maximal de colonnes supporté pour les importations de fichiers CSV est %d.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>aucun</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>Arrêt de décompression</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>ascension</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>plafond</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>charge</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>transmetteur</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>violation</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>marque-page</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>surface</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>palier de sécurité</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>Changement de gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>palier de sécurité (volontaire)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>palier de sécurité (obligatoire)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>Arrêt profond</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>plafond (palier de sécurité)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>Temps de plongée</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>sous profondeur plancher</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>profondeur max</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>temps d'air</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>entête</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Avertissement de niveau « tissue »</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>temps sans arrêt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>numéro d'événement non valide</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>Impossible de créer une analyse pour %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Impossible d'enregistrer les données</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Impossible d'analyser l'heure</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Plongée 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>Impossible d'analyser le temps de plongée</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Impossible d'analyser la profondeux maximale</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Impossible d'analyser le nombre de mélange gazeux</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Impossible d'obtenir la salinité de l'eau</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Erreur à l'obtention de la pression en surface</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Impossible d'analyser le mélange gazeux</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Impossible d'analyser des échantillons</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Événement : attente d'une action de l'utilisateur</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>modèle = %u (0x%08x), firmware = %u (0x%08x), port série = %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>Impossible d'enregistrer le gestionnaire d'événement.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Impossible d'enregistrer le gestionnaire d'annulation.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Erreur à l'import des données de plongées</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>Impossible de créer un contexte libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Impossible d'ouvrir %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>Valeur de pourcentage étrange %s @@ -3034,85 +3185,79 @@ Moyenne</translation> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Impossible d'analyser « %s ». -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Impossible d'analyser « %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>Échec de la requête. </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>Connexion à la base de données impossible '%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>Échec de la requête '%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>Impossible d'ouvrir le feuille de style %s</translation> </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>Nitrox%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>Impossible de trouver le gaz %d/%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>Trop de gaz différents</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 @@ -3125,357 +3270,363 @@ basé sur un GFlow = %.0f et un 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>Transition vers %.*f %s en %d:%02d min - temps %d:%02u sur %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>Rester à %.*f %s pour %d:%02d min - temps %d:%02u sur %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Changer pour du gaz %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Consommation de gaz : </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f%s de %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>%sT: %d:%02d min</translation> </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>%s %sPd:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sPd:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 plongées)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 plongée)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>bateau</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>rivage</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>dérivante</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>profondeur</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>grotte</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>glace</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>épave</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>grotte</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>altitude</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>piscine</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>Lac</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>rivière</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>nuit</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>eau douce</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>étudiant</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>photo</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>video</source> <translation>vidéo</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>instructor</source> <translation>instructeur</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>décompression</translation> </message> @@ -3525,97 +3676,97 @@ EADD: %d%s <translation>(pas de plongées)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>Dim.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Lun.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Mar.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>Mer.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Jeu.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Ven.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>Sam.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Janv.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Fév.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Mar.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Apr</source> <translation>Avril</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Juin</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Juil.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Août</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Sept.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Oct.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Nov.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Déc.</translation> </message> diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts index 45a2689c7..ab437c687 100644 --- a/translations/subsurface_he.ts +++ b/translations/subsurface_he.ts @@ -37,37 +37,42 @@ <translation>O</translation> </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>ערוך שמות מחשבים</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>דגם</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>מזהה התקן</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>כינוי</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>אוויר</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>EAN%1</translation> </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>מעבר חרום למערכת נשימה פתוחה</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>להתחיל</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>סוף</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>אוויר</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>EAN%1</translation> </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>ליטר לדקה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation>רגל מעוקב לדקה</translation> </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>הצג חיפוש</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>הצג הכל</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>הסתר הכל</translation> </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>מחיקת צלילה/צלילות</translation> </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>לא להתחשב בצלילות</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>שמור בשם</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>יצוא כקובץ UDDF</translation> </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>העלה צלילות לאתר divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>שמור צלילות בשם...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>שמור קובץ בשם</translation> </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>UDDF קבצי (*.uddf *.UDDF)</translation> </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>אחד צלילות נבחרות</translation> </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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30 רגל</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>שגיאת מיקום</translation> </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>עצירה אחת או יותר יאבדו בפעולה זו @@ -493,37 +503,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>אוויר</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>עומק מירבי</translation> </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>משך הצלילה</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>אוויר שנוצל</translation> </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>למחוק תוכנית?</translation> </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>אזהרה, אתם עומדים למחוק תוכנית צלילה.</translation> </message> @@ -531,17 +546,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> @@ -549,72 +564,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>עומק</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>זמן</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>לחץ</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>טמפרטורה</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>צריכת אויר</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> @@ -622,67 +637,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>תאריך</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1297"/> + <location filename="../qt-ui/models.cpp" line="1314"/> <source>m</source> <translation>מטר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1297"/> + <location filename="../qt-ui/models.cpp" line="1314"/> <source>ft</source> <translation>רגל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1300"/> + <location filename="../qt-ui/models.cpp" line="1317"/> <source>min</source> <translation>דקה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>lbs</source> <translation>ליברה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1309"/> + <location filename="../qt-ui/models.cpp" line="1326"/> <source>suit</source> <translation>חליפה</translation> </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>מיקום</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1318"/> + <location filename="../qt-ui/models.cpp" line="1335"/> <source>SAC</source> <translation>צריכת אוויר</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>רעילות שייורית מקסימלית</translation> </message> @@ -690,44 +705,44 @@ 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>תגובה לא חוקית מהשרת</translation> </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>תג XML הצפוי 'DiveDates' לא נמצא</translation> </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>תגובת XML פגומה. שורה %1: %2</translation> </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>שום צלילות נבחרו</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> - <translation>נכשל ביצירת קובץ zip להעלאה: 1%</translation> + <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> - <translation>לא ניתן ליצור קובץ זמני: 1%</translation> + <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> - <translation>שגיאה פנימית: %1</translation> + <source>internal error: %s</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> @@ -735,70 +750,70 @@ Please, remove them first.</source> <translation>שגיאה פנימית</translation> </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>סיים</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>העלאת רשימת צלילות...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>הורדת רשימת צלילות...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>הורדת 1% צלילות...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>ההורדה הסתיימה - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>הורדה פגומה</translation> </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>לא היה אפשרות לפתוח את הארכיון: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>ההעלאה נכשלה</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>ההעלאה הסתיימה בהצלחה</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>שגיאת התחברות (הזדהות)</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>תשובה לא ברורה</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>שגיאה: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>ההעלאה הסתיימה</translation> </message> @@ -921,7 +936,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> @@ -930,13 +945,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>הערות צלילה</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>מיקום</translation> </message> @@ -962,13 +977,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>טמפ' האוויר</translation> </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>טמפ' מים</translation> </message> @@ -994,7 +1009,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>הערות</translation> </message> @@ -1125,13 +1140,13 @@ Please, remove them first.</source> <translation>הוסף מערכת משקולות</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>מיקום</translation> </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>הערות</translation> </message> @@ -1146,61 +1161,61 @@ Please, remove them first.</source> <translation>בטל</translation> </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>צלילות מרובות בעריכה.</translation> </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>צלילה זו בעריכה.</translation> </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>לדקה</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>לא ידוע</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1006"/> + <location filename="../qt-ui/maintab.cpp" line="1054"/> <source>N</source> <translation>צ</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1006"/> + <location filename="../qt-ui/maintab.cpp" line="1054"/> <source>S</source> <translation>ד</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>E</source> <translation>מז</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>W</source> <translation>מע</translation> </message> @@ -1208,109 +1223,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>פילטר</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>&קובץ</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>&יומן</translation> </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>&עזרה</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>&ייבא</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>יומן &חדש</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>חדש</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>&לפתוח יומן</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>פתח</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>&שמור</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>שמור</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>שמור בשם</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>Ctrl+Shift+S</translation> </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>סגור</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>יצוא &UDDF</translation> </message> @@ -1325,132 +1340,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>Ctrl+U</translation> </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>&הדפס</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>&צא</translation> </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>Ctrl+G</translation> </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>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>&מספר מחדש</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>&סטטיסטיקה שנתית</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>רשימת צלילות</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>פרופיל</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>פרטים</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>כולם</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>&מדריך משתמש</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>גלובוס</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>ת&כנן צלילה</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>יבוא מ- Divelogs.de</translation> </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>Ctrl+P</translation> </message> @@ -1473,11 +1508,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>...</translation> </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> @@ -1502,221 +1538,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>העדפות</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>הוסף צלילה</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>קבץ אוטומטי</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>קודם</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>שמאל</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>הבא</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>ימין</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>בחירת אירועים</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>הכנסת תכנית</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>אודות Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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>פתך קובץ</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>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני סגירת הקובץ.</translation> </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>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני שאתה מנסה לתכנן צלילה.</translation> </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>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני שאתה מנסה להוסיף צלילה.</translation> </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>האם ברצונכם לשמור שינויים בקובץ %1 ?</translation> </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>האם לשמור שינויים בקובץ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>לשמור שינויים?</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>כל השינויים יאבדו אם לא תשמרו אותם.</translation> </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>שמור קובץ בשם</translation> </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>אזהרה</translation> </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>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני פתיחת קובץ חדש.</translation> </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>UDDF קבצי (*.uddf *.UDDF)</translation> </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 type="unfinished"/> </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>קבצי XML נתמכים (*.ssrf *.xml *.XML)</translation> </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> @@ -1799,177 +1845,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>מערכת</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>מידה</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>אמריקאית</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>התאמה אישית</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>עומק</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>מטר</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>רגל</translation> </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>ליטר</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>רגל מ"ק</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>צלסיוס</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>פרנהייט</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>קילוגרם</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>ברירת מחדל של המערכת</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>פילטר</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>לחץ</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>נפח</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>טמפרטורה</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>משקל</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>יחידות זמן</translation> </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>מקדם עליה וירידה</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>דקות</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>שניות</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>הצג</translation> </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>שונות</translation> </message> @@ -1979,32 +2040,32 @@ Please, remove them first.</source> <translation>העדפות</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>גרדיאנט תחתון</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>גרדיאנט עליון</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>נדרשת הפעלה מחדש</translation> </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>כדי לטעון שפה חדשה בצורה נכונה עליך להפעיל מחדש את Subsurface</translation> </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>פתח יומן ברירת מחדל</translation> </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>קבצי XML נתמכים (*.ssrf *.xml *.XML)</translation> </message> @@ -2012,22 +2073,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>&תצוגה מקדימה</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>ה&דפס</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>&סגור</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>הדפס</translation> </message> @@ -2153,72 +2209,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>לא ידוע</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>צלילות מס %1 - %2</translation> </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>עומק מקסימלי: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>זמן: %1 דקות</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>אוויר שנוצל:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>צריכת אויר:</translation> </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>משקולות:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>הערות:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>מדריך צלילה:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>בן זוג:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>חליפה:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>ראות:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>דירוג</translation> </message> @@ -2226,40 +2282,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>הוספת סימנייה</translation> </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>הסר את האירוע</translation> </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>הסתר אירועים דומים</translation> </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>חשוף את כל האירועים</translation> </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>אוויר</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> @@ -2269,22 +2360,22 @@ Please, remove them first.</source> <translation>סגור</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>ממוצע</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>מינימום</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>מקסימום</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>תזיז את המפה ולחץ לחיצה כפולה כדי לקבוע את מיקום הצלילה</translation> </message> @@ -2292,12 +2383,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>מספר מחדש</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>מספר התחלתי חדש</translation> </message> @@ -2305,52 +2396,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>מוקדם יותר</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>מאוחר יותר</translation> </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> @@ -2358,27 +2449,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>מוקדם יותר</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>מאוחר יותר</translation> </message> @@ -2414,42 +2521,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>שרות איטרנט</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>מתחבר...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>ההורדה הסתיימה</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>שגיאת הורדה: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>שגיאת חיבור:</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>שם משתמש לא חוקי!</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>תשובה לא מובנת!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>ההורדה הצליחה!</translation> </message> @@ -2465,17 +2572,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>תיאור</translation> </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> @@ -2488,6 +2595,49 @@ Please, remove them first.</source> <translation>מידע נוסף</translation> </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> @@ -2504,12 +2654,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>תיאור</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>קילוגרם</translation> </message> @@ -2543,11 +2693,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>סיסמא</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>ההעלאה</translation> </message> @@ -2565,37 +2720,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>סוג</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>משקל</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>קילוגרם</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="442"/> + <location filename="../qt-ui/models.cpp" line="454"/> <source>lbs</source> <translation>ליברה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="465"/> + <location filename="../qt-ui/models.cpp" line="478"/> <source>ft</source> <translation>רגל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="466"/> + <location filename="../qt-ui/models.cpp" line="479"/> <source>m</source> <translation>מטר</translation> </message> @@ -2603,79 +2758,79 @@ 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>שנה > חודש / טיול</translation> </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>משך כולל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> ממוצע</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> קצר ביותר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> ארוך ביותר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>עומק (%1) ממוצע</translation> </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> מינימום</translation> </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> מקסימום</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>צריכת אויר (%1) ממוצע</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>טמפ' (%1) @@ -2685,72 +2840,72 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="57"/> + <location filename="../dive.c" line="58"/> <source>pascal</source> <translation>פסקל</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>מטר</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>רגל</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>קילוגרם</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%S) או (%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> @@ -2782,334 +2937,325 @@ Maximum</source> <translation>נצמד</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>קריאה מ'%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>אין</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>עצירה לדיקומפרסיה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>זמן נותר בעומק</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>עליה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>תקרה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>עומס</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>משדר</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>חריגה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>סימניה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>שטח</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>עצירת בטיחות</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>החלפת גז</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>עצירת בטיחות (יזומה)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>עצירת בטיחות (חובה)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>עצירה בעומק</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>תקרה (עצירת בטיחות)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>זמןצלילה</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>עומק מקס'</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>זמן אויר</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>כותרת</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>אזהרת רמות רקמות</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>זמן ללא עצירה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>מס' ארוע שגוי</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>לא מצליח להבין %s %s </translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>שגיאה ברישום המידע</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>שגיאה בקריאת תאריך</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>צלילה %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>שגיאה בקריאת זמן צלילה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>שגיאה בקריאת עומק מקסימלי</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>שגיאה בקריאת תערובת גזים</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>שגיאה בקבלת מליחות מים</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>שגיאה בקבלת לחץ על פני המים</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>שגיאה בקריאת תערובת הגזים</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>שגיאה בקריאת נקודות דגימה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>אירוע: מחכה לפעולה של המשתמש</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>דגם=%u (0x%08x), הקושחה=%u (0x%08x), מספר סידורי=%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>שגיאה ברישום שגרת ניהול</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>שגיאת יבוא נתוני צלילה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>לא ניתן לפתוח את %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 type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1845"/> + <location filename="../parse-xml.c" line="1846"/> <source>Database query get_events failed. </source> <translation>שאילתת מסד נתונים של Get_events נכשל </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>החיבור למסד הנתונים נכשל '%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>שאילתת מסד נתונים נכשל '%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>לא ניתן לפתוח את גיליון העיצוב %s</translation> </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>לא ניתן למצוא את הגז %d/%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation type="unfinished"/> </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 @@ -3118,353 +3264,359 @@ based on GFlow = %.0f and GFhigh = %.0f <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>לעבור לגז s% </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>צריכת דלק: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="783"/> + <location filename="../planner.c" line="810"/> <source>ean</source> <translation type="unfinished"/> </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>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </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>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 צלילות)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 צלילה)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>ספינה</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>חוף</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>סחיפה</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>עמוק</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>מחילה</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>קרח</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>מערה</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>גובה</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>ברכה</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>אגם</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>נחל</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>לילה</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>fresh</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>תלמיד</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>תצלום</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>video</source> <translation>וידאו</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>instructor</source> <translation>מדריך</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>דקומפרסיה</translation> </message> @@ -3514,97 +3666,97 @@ EADD: %d%s <translation>(שום צלילות)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>ראשון</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>שני</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>שלישי</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>רביעי</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>חמישי</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>שישי</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>שבת</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>ינואר</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>פבואר</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>מרץ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Apr</source> <translation>אפריל</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>May</source> <translation>מאי</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>יוני</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>יולי</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>אוגוסט</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>ספטמבר</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>אוקטובר</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>נובמבר</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>דצמבר</translation> </message> diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts index ca1e69856..991d9ce72 100644 --- a/translations/subsurface_hr_HR.ts +++ b/translations/subsurface_hr_HR.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>Promijeni nazive računala</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>Model</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>Naziv uređaja</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>zrak</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>Neplanirani prelazak na OC sustav</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> započni</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> završi</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>zrak</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>Zrak</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>Trajanje</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>Dubina</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>Vrijeme</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>Pritisak</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>Temperatura</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>Br.</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>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</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>maxCNS</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>Bilješke</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>Lokacija</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>Bilješke</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>nepoznato</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>Filter</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>Novi</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 type="unfinished"/> </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>Spremi kao</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>Zatvori</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>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Informacije</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>Postavke</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>Prethodno računalo</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>Sljedeće računalo</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>Odaberi događaje</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Unesi plan urona</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>O programu Subsurface</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>Otvori datoteku</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>Spremi promjene?</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>Godišnje statistike</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"/> - <source>System</source> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> - <source>Metric</source> + <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="306"/> - <source>Imperial</source> + <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="323"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="333"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <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>Dubina</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>kg</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>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Pritisak</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>Temperatura</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Težina</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>Postavke</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>nepoznato</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>Zrak</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>Zatvori</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Ø</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Min.</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Max.</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>Renumeriraj</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>Novi početni broj</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>Web servis</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Spajanje...</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>Greška u komunikaciji: </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>Neispravna korisnička oznaka</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>Ne mogu obraditi odziv</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Preuzimanje uspješno!</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> @@ -2486,6 +2593,49 @@ Please, remove them first.</source> <translation type="unfinished"/> </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> @@ -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>kg</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>Lozinka</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>Vrsta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Težina</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>kg</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>Br.</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>Pa</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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) ili (%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>Nije uspjelo čitanje '%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>nijedan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>deko zastoj</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>izron</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>strop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>opterećenje</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>odašiljač</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>povreda</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>bookmark</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>površina</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>sigurnosna stanka</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>promjena plina</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>sigurnosna stanka (opcionalna)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>sigurnosna stanka (obavezna)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>dubinska stanka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>strop (sigurnosni zastoj)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>trajanje urona</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>Max dubina</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>preostalo trajanje zraka</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>kurs</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>upozorenje tkivo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>non stop vrijeme</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>neispravan broj događaja</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>Ne mogu kreirati parser za %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Greška pri registraciji podataka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Greška pri parsiranju datuma i vremena</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Uron #%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>Greška pri parsiranju vremena urona</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Greška pri parsiranju maksimalne dubine</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Greška pri parsiranju broja mješavina</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Greška pri dohvaćanju saliniteta vode</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>Greška pri parsiranju mješavine plinova</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Greška pri parsiranju uzoraka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Događaj: čekanje na korisničku akciju</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%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>Greška pri registraciji event handlera.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Greška pri registraciji cancellation handlera</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Greška pri uvozu podataka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>Ne mogu kreirati libdivecomputer kontekst</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Nije uspjelo otvaranje %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>Neobično očitanje postotka %s @@ -3021,85 +3172,79 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Nije uspjelo parsiranje '%s'. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Nije uspjelo parsiranje '%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>Neuspjeo get_events na bazi. </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>Neuspjelo spajanje na bazu '%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>Neuspjeo upit na bazu '%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>Ne mogu naći plin %d/%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>Previše mješavina plinova</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 @@ temeljen na GFlow = %.0f i 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>Prelazak na %.*f %s u %d:%02d min - ukupno vrijeme %d:%02u na %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>Stanka na %.*f %s u trajanju %d:%02d min - Ukupno vrijeme %d:%02u na %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Prebaci plin na %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Potrošnja plina: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f%s %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>brod</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>obala</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>drift</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>dubok</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>pećina</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>led</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>olupina</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>špilja</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>nadmorska visina</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>bazen</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>jezero</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>rijeka</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>noć</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>fotografija</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>deko</translation> </message> @@ -3510,97 +3661,97 @@ EADD: %d%s <translation>(nema urona)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>Ned</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Pon</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Uto</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>Sri</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Čet</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Pet</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>Sub</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Sij</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Velj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Ožu</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Apr</source> <translation>Tra</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>May</source> <translation>Svi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Lip</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Srp</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Kol</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Ruj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Lis</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Stu</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Pro</translation> </message> diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts index b9f70495a..fb4d1bfd7 100644 --- a/translations/subsurface_hu.ts +++ b/translations/subsurface_hu.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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="489"/> + <location filename="../qt-ui/models.cpp" line="503"/> <source>bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="512"/> + <location filename="../qt-ui/models.cpp" line="527"/> <source>l</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="513"/> + <location filename="../qt-ui/models.cpp" line="528"/> <source>cuft</source> <translation type="unfinished"/> </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>Búvárkomputer becenevének szerkesztése</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>Típús</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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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>kezdés</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>befejezés</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 type="unfinished"/> </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>LÉG</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>Tartam</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>Mélység</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>Idő</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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/> <source>Temperature</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1297"/> + <location filename="../qt-ui/models.cpp" line="1314"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1300"/> + <location filename="../qt-ui/models.cpp" line="1317"/> <source>min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>lbs</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1321"/> + <location filename="../qt-ui/models.cpp" line="1338"/> <source>OTU</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1324"/> + <location filename="../qt-ui/models.cpp" line="1341"/> <source>maxCNS</source> <translation type="unfinished"/> </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>Merülés Jegyzetek</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>Hely</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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>E</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>W</source> <translation type="unfinished"/> </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>Szűrő</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>Új</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>Ment</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 type="unfinished"/> </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>Bezárás</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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Infó</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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Terv Megadás</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>A Subsurface-ről</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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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"/> - <source>System</source> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> - <source>Metric</source> + <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="306"/> - <source>Imperial</source> + <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="323"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="333"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <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>Mélység</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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="384"/> + <location filename="../qt-ui/preferences.ui" line="411"/> <source>psi</source> <translation type="unfinished"/> </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 type="unfinished"/> </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>Szűrő</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="465"/> + <location filename="../qt-ui/preferences.ui" line="492"/> <source>lbs</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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>LÉG</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>Bezárás</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Átlag</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Maximum</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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/renumber.ui" line="31"/> + <location filename="../qt-ui/renumber.ui" line="43"/> <source>New starting number</source> <translation>Új kezdő szám</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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Csatlakozás...</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>Csatlakozási Hiba:</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>Érvénytelen felhasználó azonosító</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>Nem lehet feldolgozni választ!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>A Letöltés Sikeres!</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 type="unfinished"/> </message> @@ -2486,6 +2593,49 @@ Please, remove them first.</source> <translation type="unfinished"/> </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> @@ -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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="442"/> + <location filename="../qt-ui/models.cpp" line="454"/> <source>lbs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="465"/> + <location filename="../qt-ui/models.cpp" line="478"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="466"/> + <location filename="../qt-ui/models.cpp" line="479"/> <source>m</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) vagy (%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,332 +2925,322 @@ Maximum</source> <translation type="unfinished"/> </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>'%s' olvasása meghiúsult.</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 type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="403"/> + <location filename="../libdivecomputer.c" line="405"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Hiba az adat regisztrálása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Hiba a dátumidő feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Merülés %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>Hiba a merülési idő feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Hiba a max mélység feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Hiba gáz keverék számítás feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Hiba a víz sótartalmának lekérdezésekor</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>Hiba a gáz keverék feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Hiba a minták feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Esemény: várakozás a felhasználóra</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 type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="689"/> + <location filename="../libdivecomputer.c" line="691"/> <source>Error registering the event handler.</source> <translation>Hiba az esemény kezelő regisztrálása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Hiba a visszavonás kezelő regisztrálása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Merülési adat importálási hiba</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="484"/> + <location filename="../parse-xml.c" line="462"/> <source>Strange percentage reading %s </source> <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>'%s' értelmezése meghiúsult. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>'%s' értelmezése meghiúsult.</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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation type="unfinished"/> </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 @@ -3104,351 +3249,357 @@ based on GFlow = %.0f and GFhigh = %.0f <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Gáz felhasználás: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="783"/> + <location filename="../planner.c" line="810"/> <source>ean</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>video</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> @@ -3498,97 +3649,97 @@ EADD: %d%s <translation>(nincs merülés)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>H</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>P</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Már</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Apr</source> <translation>Ápr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>May</source> <translation>Máj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Jún</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Júl</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Dec</translation> </message> diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts index 29004fa37..dbfdeabf4 100644 --- a/translations/subsurface_id.ts +++ b/translations/subsurface_id.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>I</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>Ubah Nama Panggilan Perangkat</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>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>ID Perangkat</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Nama Panggilan</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>udara</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>EAN%1</translation> </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>Bailing out untuk 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>Mulai</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>Akhir</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>udara</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>EAN%1</translation> </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>I/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation>cuft/min</translation> </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>Munculkan Kotak Pencari</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>Tampilkan semua</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>Sembunyikan semua</translation> </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>Simpan Berkas sebagai</translation> </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>Gabungkan selam berikut</translation> </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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Kesalahan posisi Handler</translation> </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>Satu atau lebih dari Pemberhentianmu akan hilang melalui pengoperasian ini, Coba, lepas terlebih dahulu</translation> @@ -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>UDARA</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Kedalaman akhir</translation> </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>Durasi</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Gas terpaikai</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>Titik CC</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation>Abaikan Rencana</translation> </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>Kamu hendak mengabaikan Rencana</translation> </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>Titik-titik Rencana Selam</translation> </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>edalaman</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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/> <source>Pressure</source> <translation>Tekanan</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>Suhu</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>menit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</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>maxCNS</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>Catatan Selam</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>Lokasi</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>Catatan</translation> </message> @@ -1123,13 +1138,13 @@ Please, remove them first.</source> <translation>Tambah Sistem Berat</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Lokasi Perjalanan</translation> </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>Catatan Perjalanan</translation> </message> @@ -1144,61 +1159,61 @@ Please, remove them first.</source> <translation>Batal</translation> </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>/menit</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>Tak dikenal</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1006"/> + <location filename="../qt-ui/maintab.cpp" line="1054"/> <source>N</source> <translation>U</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>T</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>W</source> <translation>B</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>Saring</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>Baru</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </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>Buka</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </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>Simpan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Simpan sebagai</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>Ctrl+Shift+S</translation> </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>Tutup</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </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>&Print</translation> </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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation type="unfinished"/> </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>Ctrl+P</translation> </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>...</translation> </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>Preferensi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Tambah Selam</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Grup Otomatis</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Cltrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>DC Sebelumnya</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Kiri</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>DC Selanjunya</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Kanan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Pilih Aktifitas</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Masukkan Rencana</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>Tentang Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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>Buka Berkas</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>Anda ingin menyimpan perubahan yang sudah dilakukan pada Berkas %1</translation> </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>Anda ingin menyimpan perubahan yang sudah dilakukan pada datafile?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Simpan perubahan?</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>Perubahan akan hilang jika anda tidak simpan.</translation> </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>Simpan Berkas sebagai</translation> </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 type="unfinished"/> </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>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </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>Sistem</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Metrik</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Personalisasi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>edalaman</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>kgkg</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>Saring</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Tekanan</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Suhu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Berat</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>Satuan Waktu</translation> </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>penyebut kecepatan naik/turun</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Menit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Detik</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Tampilkan</translation> </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>Lain-lain</translation> </message> @@ -1977,32 +2038,32 @@ Please, remove them first.</source> <translation>Preferensi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GFlow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GFHigh</translation> </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>Buka Berkas Log Acuan</translation> </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>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </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>Tak dikenal</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>Selam #%1 - %2</translation> </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>Kedalaman Maks: 1% 2%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Durasi: %1 menit</translation> </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>UDARA</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>Tutup</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Rata-rata</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Minimal</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Maksimal</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>Penomeran Ulang</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>Nomor Awal baru</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>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation type="unfinished"/> </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>Kesalahan Koneksi:</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>identifikasi pengguna tidak cocok!</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>Respon gagal di telaah!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Unduh Sukses!</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>Penjelasan</translation> </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> @@ -2486,6 +2593,49 @@ Please, remove them first.</source> <translation>Informasi</translation> </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> @@ -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>Penjelasan</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kgkg</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 type="unfinished"/> </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>Tipe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Berat</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>kgkg</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,77 +2756,77 @@ 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>Total Durasi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> Rata-rata</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> Terpendek</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> Terjauh</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Dalam (%1) Rata-rata</translation> </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> Minimal</translation> </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> Maksimal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Rata-rata</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2681,72 +2836,72 @@ Rata-rata</translation> <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>I</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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) or (%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> @@ -2778,331 +2933,322 @@ Rata-rata</translation> <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>Gagal baca '%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>kosong</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>pemberhentian 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>nai</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>batas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>beban kerja</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>pemancar</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>gangguan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>tandai</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>permuakaan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation type="unfinished"/> </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>ganti gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>safety stop (bebas)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>safety stop (wajib)</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>batas (safety stop)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>waktu selam</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>dalam maks</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>waktu mengudara</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>judul</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>peringatan tingkat jaringan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>waktu non stop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>nomor kejadian tidak sesuai</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>tidak dapat membuat pengurai untuk %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Gagal mendaftarkan data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Gagal mengurai tanggal</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Selam %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>Gagal mengurai waktu selam</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Gagal mengurai kedalamn maks</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Gagal mengurai perhitungan campuran gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="689"/> + <location filename="../libdivecomputer.c" line="691"/> <source>Error registering the event handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="484"/> + <location filename="../parse-xml.c" line="462"/> <source>Strange percentage reading %s </source> <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1845"/> + <location filename="../parse-xml.c" line="1846"/> <source>Database query get_events failed. </source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation type="unfinished"/> </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 @@ -3111,350 +3257,356 @@ based on GFlow = %.0f and GFhigh = %.0f <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="783"/> + <location filename="../planner.c" line="810"/> <source>ean</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>video</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> @@ -3504,97 +3656,97 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Apr</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>May</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts index 134292a37..28845536d 100644 --- a/translations/subsurface_it_IT.ts +++ b/translations/subsurface_it_IT.ts @@ -37,37 +37,42 @@ <translation>O₂</translation> </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>Facendo click qui si rimuove la bombola.</translation> </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>La bombola non può essere rimossa</translation> </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>Questo gas è in uso. Solo le bombole che non sono usate nell'immersione possono essere rimosse.</translation> </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>piedi cubi</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>Modifica il soprannome del computer</translation> </message> @@ -95,22 +100,22 @@ il computer seleizonato?</translation> <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>Modello</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>ID della periferica</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Nickname</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>Facendo click qui si rimuove questo computer.</translation> </message> @@ -118,28 +123,28 @@ il computer seleizonato?</translation> <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>aria</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>EAN1%</translation> </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>Bailing out in circuito aperto</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>inizio</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>fine</translation> @@ -148,12 +153,12 @@ il computer seleizonato?</translation> <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>aria</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>EAN1%</translation> </message> @@ -161,12 +166,12 @@ il computer seleizonato?</translation> <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>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation>piedi cubi/min</translation> </message> @@ -174,112 +179,117 @@ il computer seleizonato?</translation> <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>Mostra la finestra di ricerca</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>espandi tutto</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>collassa tutte le voci</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>Nascondi le altre immersioni</translation> </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>rimuovi l'immersione(i) dal viaggio</translation> </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>crea un nuovo viaggio sopra</translation> </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>aggiungi immersione(i) immediatamente sopra</translation> </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>unisci il viaggio con il viaggio sopra</translation> </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>unisci il viaggio con il viaggio sotto</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>cancella immersione(i)</translation> </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>segnala immersione(i) non valide</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>Salva come</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>Esporta come UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>Cambia l'orario</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="735"/> + <location filename="../qt-ui/divelistview.cpp" line="765"/> <source>load images</source> <translation>Carica immagini</translation> </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>Carica le immersioni a divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>Salva immersioni come ...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Salva come</translation> </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>File UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="801"/> + <location filename="../qt-ui/divelistview.cpp" line="831"/> <source>Open Image Files</source> <translation>Apri file immagine</translation> </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>Formato file immagine (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="760"/> <source>merge selected dives</source> <translation>unisci le immersioni selezionate</translation> </message> @@ -469,22 +479,22 @@ il computer seleizonato?</translation> <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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30 piedi</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Gestore dell'errore di posizione</translation> </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>Una o più soste verranno perse con questa operazione, @@ -494,37 +504,42 @@ Per favore, rimuovile prima.</translation> <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>ARIA</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Profondità finale</translation> </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>Durata</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Gas usato</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation>Elimino il piano?</translation> </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>Stai cancellando il piano</translation> </message> @@ -532,17 +547,17 @@ Per favore, rimuovile prima.</translation> <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>Punti del Dive Planner</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>Miscele disponibili</translation> </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>aggiungi una sosta all'immersione</translation> </message> @@ -550,72 +565,72 @@ Per favore, rimuovile prima.</translation> <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>Profondità</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>Ora</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>Pressione</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>Temperatura</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>Colore</translation> </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>Inserito dall'utente</translation> </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>Indice della bombola</translation> </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>Pressione S</translation> </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>Pressione I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Ceiling</source> <translation>Ceiling</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>SAC</source> <translation>CAS</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>pN2</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>PHE</source> <translation>pHe</translation> </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> @@ -623,67 +638,67 @@ Per favore, rimuovile prima.</translation> <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>data</translation> </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>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</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>muta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>bombola</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>Luogo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1318"/> + <location filename="../qt-ui/models.cpp" line="1335"/> <source>SAC</source> <translation>CAS</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>max CNS</translation> </message> @@ -691,44 +706,44 @@ Per favore, rimuovile prima.</translation> <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>Risposta non valida dal server</translation> </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>Tag XML atteso 'DiveDateReader', trovato invece '%1</translation> </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>Tag XML atteso 'DiveDateReader' non trovato</translation> </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>Risposta XML malformata. Linea %1: %2</translation> </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>nessuna immersione è selezionata</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> - <translation>Errore nella creazione del file zip per l'upload: %1</translation> + <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> - <translation>errore nella creazione del file temporaneo: %1</translation> + <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> - <translation>errore interno: %1</translation> + <source>internal error: %s</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> @@ -736,70 +751,70 @@ Per favore, rimuovile prima.</translation> <translation>errore interno</translation> </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>Fatto</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>Sto caricando la lista immersioni...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>Sto scaricando la lista immersioni...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>Sto scaricando %1 immersioni...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>Scaricamento finito - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Scaricamento corrotto</translation> </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>L'archivio non può essere aperto: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>Caricamento fallito</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Caricamento eseguito</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>Accesso fallito</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>Non riesco ad analizzare la risposta</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Errore: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Caricamento finito</translation> </message> @@ -922,7 +937,7 @@ Per favore, rimuovile prima.</translation> <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>Modifica le località d'immersione selezionate</translation> </message> @@ -931,13 +946,13 @@ Per favore, rimuovile prima.</translation> <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>Note dell'immersione</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>Luogo</translation> </message> @@ -963,13 +978,13 @@ Per favore, rimuovile prima.</translation> </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>Temperatura aria</translation> </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>Temperatura dell'acqua</translation> </message> @@ -995,7 +1010,7 @@ Per favore, rimuovile prima.</translation> </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>Note</translation> </message> @@ -1126,13 +1141,13 @@ Per favore, rimuovile prima.</translation> <translation>Aggiungi un tipo di pesi</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Luogo del viaggio</translation> </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>Note di viaggio</translation> </message> @@ -1146,62 +1161,62 @@ Per favore, rimuovile prima.</translation> <source>Cancel</source> <translation>Annulla</translation> </message> - <message> - <location filename="../qt-ui/maintab.cpp" line="232"/> - <source>Air temp [%1]</source> - <translation type="unfinished"/> - </message> <message> <location filename="../qt-ui/maintab.cpp" line="233"/> - <source>Water temp [%1]</source> - <translation type="unfinished"/> + <source>Air temp [%1]</source> + <translation>Temperatura dell'aria [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="234"/> + <source>Water temp [%1]</source> + <translation>Temperatura dell'acqua [%1]</translation> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>This trip is being edited.</source> <translation>Questo viaggio è stato editato.</translation> </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>Si stanno modificando immersioni multiple.</translation> </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>Si sta modificando questa immersione </translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>sconosciuto</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> @@ -1209,249 +1224,269 @@ Per favore, rimuovile prima.</translation> <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>Filtro</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>&File</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>&Vista</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>&Aiuto</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>&Importa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>&Nuovo logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Nuovo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>&Apri logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Apri</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl-O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>&Salva</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Salva</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Salva come</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>Ctrl+Shift+S</translation> </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>Chiudi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>Esporta &UUDF</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="138"/> <source>Enable the pN2 Graph</source> - <translation type="unfinished"/> + <translation>Abilita il grafico pN2</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="164"/> <source>Enable the pHe graph</source> + <translation>Abilita il grafico pHe</translation> + </message> + <message> + <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="326"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Enable EAD, END, and EADD</source> <translation>Abilità EAD, END e EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Show NDL / TTS</source> - <translation type="unfinished"/> + <translation>Mostra NDL / TTS</translation> </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"/> + <translation>Cambia la scala dell'asse della profondità</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="681"/> + <location filename="../qt-ui/mainwindow.ui" line="709"/> <source>Ctrl+U</source> <translation>Ctrl-U</translation> </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>&Stampa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>&Esci</translation> </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>Importa &dal computer</translation> </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>Importa dati &GPS del servizio Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>&Modifica il nome della periferica</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>&Rinumera</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>&Statistiche Annuali</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Lista immersioni</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Profilo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Informazioni</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Tutti</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>&Manuale Utente</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Globo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>Pianifica immersione</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>Importa da Divelogs.de</translation> </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>Ctrl+P</translation> </message> @@ -1474,11 +1509,12 @@ Per favore, rimuovile prima.</translation> <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>...</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="300"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>Enable MOD</source> <translation>Abilita MOD</translation> </message> @@ -1503,221 +1539,231 @@ Per favore, rimuovile prima.</translation> <translation>Calcola tutti i tessuti</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="378"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>Show SAC Rate</source> <translation>Mostra il consumo equivalente di superficie (SAC)</translation> </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>Abilita / Disabilita righello</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Preferences</source> <translation>Preferenze</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Aggiungi immersione</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Raggruppamento Automatico</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>DC precedente</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Sinistra</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>DC successivo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Destra</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Seleziona eventi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Piano in ingresso</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>Informazioni su Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="859"/> + <location filename="../qt-ui/mainwindow.ui" line="895"/> <source>Import Log Files</source> <translation>Importa logbook da file</translation> </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>Importa log delle immersioni da altra applicazioni</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="878"/> + <location filename="../qt-ui/mainwindow.ui" line="914"/> <source>&Full Screen</source> <translation>&Tutto Schermo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="881"/> + <location filename="../qt-ui/mainwindow.ui" line="917"/> <source>Toggle Full Screen</source> <translation>Abilita Modalità Tutto Schermo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="884"/> + <location filename="../qt-ui/mainwindow.ui" line="920"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="143"/> + <location filename="../qt-ui/mainwindow.cpp" line="173"/> <source>Open File</source> <translation>Apri File</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>Per favore, salva o cancella le modifiche all'immersione prima di chiudere il file.</translation> </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>Per favore, salva o cancella le modifiche all'immersione prima di pianificare un'altra immersione.</translation> </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>Per favore, salva o cancella le modifiche all'immersione prima di aggiungerne un'altra.</translation> </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>Vuoi salvare le modifiche fatte nel file %1?</translation> </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>Vuoi salvare le modifiche fatte nel datafile?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Salvare le modifiche?</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>Le modifiche saranno perse se tu non le salvi.</translation> </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>Salva come</translation> </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>Avviso</translation> </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>Per favore, salva o cancella le modifiche all'immersione prima di aprire un nuovo file.</translation> </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>File UDDF (*.uddf *.UDDF)</translation> </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>Statistiche Annuali</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>File XML Subsurface (*.ssrf *.xml *.XML)</translation> </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>Apri file di log immersioni</translation> </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>Formato del file di log (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;Formato XML(*.xml);;Formato UDDF/UDCF(*.uddf *.udcf);;Formato di log JDive(*.jlb);;Formato Suunto(*.sde *.db);;Formato CSV(*.csv);;Tutti i formati(*)</translation> </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>Per favore, prima completa le modifiche corrente prima di aggiungerne altre.</translation> </message> @@ -1792,185 +1838,200 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/preferences.ui" line="237"/> <source>Animations</source> - <translation type="unfinished"/> + <translation>Animazioni</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="243"/> <source>Speed</source> + <translation>Velocità</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="289"/> + <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>Sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Metrico</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Imperiale</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Personalizza</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Profondità</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>metri</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>piedi</translation> </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>litro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>piedi cubici</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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>soglia quando è visibile la pO₂</translation> </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>soglia quando è visibile la pN₂</translation> </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>soglia quando è visibile la pHe</translation> </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>max ppO₂ quando è visibile la MOD</translation> </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>Colora di rosso il ceiling riportato dal computer</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="655"/> - <source>unused tanks</source> - <translation>Bombole inutilizzate</translation> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="723"/> + <location filename="../qt-ui/preferences.ui" line="747"/> <source>System Default</source> <translation>Usa Lingua di sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Filtro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Pressione</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Peso</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>Unità di Tempo</translation> </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>Denominatore della Risalita/Discesa </translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Minuti</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Secondi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Mostra</translation> </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>GFLow alla massima profondità</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Varie</translation> </message> @@ -1980,32 +2041,32 @@ Per favore, rimuovile prima.</translation> <translation>Preferenze</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>Richiesto riavvio</translation> </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>Per caricare correttamente la nuova lingua è richiesto il riavvio di Subsurface.</translation> </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>Apri il log di default</translation> </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>File XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> @@ -2013,22 +2074,17 @@ Per favore, rimuovile prima.</translation> <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>&Anteprima</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>&Stampa</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>&Chiudi</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Stampa</translation> </message> @@ -2154,72 +2210,72 @@ Per favore, rimuovile prima.</translation> <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>sconosciuto</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>Immersione #%1 - %2</translation> </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>Massima profondità: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Durata: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Miscela usata:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>CAS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>Pesi:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Note:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Compagno:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Muta:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Visibilità</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Valutazione:</translation> </message> @@ -2227,40 +2283,75 @@ Per favore, rimuovile prima.</translation> <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>Aggiungi una miscela</translation> </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>Aggiungi un segnalibro</translation> </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>Rimuovi evento</translation> </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>Nascondi eventi simili</translation> </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>Mostra tutti gli eventi</translation> </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>ARIA</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>Rimuovi questo punto</translation> </message> @@ -2270,22 +2361,22 @@ Per favore, rimuovile prima.</translation> <translation>Chiudi</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Media</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Minimo</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Massimo</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>Spostare la mappa e fare doppio-click per definire la posizione dell'immersione</translation> </message> @@ -2293,12 +2384,12 @@ Per favore, rimuovile prima.</translation> <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>Rinumera</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>Nuovo numero di inizio</translation> </message> @@ -2306,52 +2397,52 @@ Per favore, rimuovile prima.</translation> <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>Cambia l'orari selezionati</translation> </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>Sposta l'orario delle immagini di</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="99"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="102"/> <source>earlier</source> <translation>prima</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>dopo</translation> </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>Per calcolare la differenza dell'orologio del tuo computer e della tua fotocamera, fai una foto al tuo computer che mostra l'orologio. Scarica questa immagina sul tuo computer e premi questo bottone.</translation> </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>Determina la differenza d'ora della fotocamera</translation> </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>Selezione un'immagine del computer che mostra l'ora</translation> </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>Quale data ed orario sono mostrati nell'immagine?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="181"/> + <location filename="../qt-ui/simplewidgets.cpp" line="203"/> <source>Open Image File</source> <translation>Apri file immagine</translation> </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>Formato file immagine (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -2359,27 +2450,43 @@ Per favore, rimuovile prima.</translation> <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>Cambia l'orari selezionati</translation> </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>Cambia l'orario delle immersioni selezionate di</translation> </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>h:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>prima</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>dopo</translation> </message> @@ -2415,42 +2522,42 @@ Per favore, rimuovile prima.</translation> <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>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>In connessione...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>Download finito</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>Errore scaricamento: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Errore di connessione:</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>Identificatore dell'utente non valido!</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>Non posso analizzare la risposta!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Download effettuato!</translation> </message> @@ -2466,17 +2573,17 @@ Per favore, rimuovile prima.</translation> <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>Descrizione</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2489,6 +2596,49 @@ Per favore, rimuovile prima.</translation> <translation>Informazione</translation> </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> @@ -2505,12 +2655,12 @@ Per favore, rimuovile prima.</translation> <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>Descrizione</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2544,11 +2694,16 @@ Per favore, rimuovile prima.</translation> </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>Password</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Invia</translation> </message> @@ -2566,37 +2721,37 @@ Per favore, rimuovile prima.</translation> <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>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Peso</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>Facendo click qui si rimuove il sistema di pesi.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</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> @@ -2604,79 +2759,79 @@ Per favore, rimuovile prima.</translation> <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>Anno > Mese / Viaggio</translation> </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>Durata Totale</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> Più corta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> Più lunga</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Profondità (%1) Media</translation> </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> Minimo</translation> </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> Massimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2686,72 +2841,72 @@ Media</translation> <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>piedi cubi</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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) oder (%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> @@ -2783,250 +2938,246 @@ Media</translation> <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>Impossibile leggere '%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>Il numero massimo di colonne supportate nel file CSV è di %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>nessuno</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>deco stop</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>risalita</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>ceiling</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>carico di lavoro</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>trasmettitore</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>violazione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>segnalibro</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>superficie</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>sosta di sicurezza</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>cambio gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>sosta di sicurezza (facoltativa)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>sosta di sicurezza (obbligatoria)</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>ceiling (sosta di sicurezza)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>durata immersione</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>sotto il piano</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>profondità massima</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>tempo in aria</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>intestazione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>avviso del livello dei tessuti</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>tempo di non stop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>numero evento non valido</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>Impossibile creare un parser per %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Errore registrando la data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Errore analizzando la data/il tempo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Immersione #%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>Errore analizzando il tempo di immersione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Errore analizzando la profondità massima</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Errore analizzando il conteggio della miscela di gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Errore nell'ottenimento della salinità dell'acqua</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Errore nell'ottenere la pressione superficiale</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Errore analizzando la miscela di gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Errore analizzando i campioni</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Evento: in attesa dell' azione dell'utente.</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>modello=%u (0x%08x), firmware=%u (0x%08x), numero di serie=%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>Errore registrando il gestore degli eventi.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Errore registrando il gestore della cancellazione.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Errore importazione dati immersione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>Impossibile creare un contesto libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Impossibile aprire %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>Lettura di strane percentuali %s @@ -3035,61 +3186,54 @@ Media</translation> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Impossibile analizzare '%s'. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Impossibile analizzare '%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>Interrogazione get_events fallita. </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>La query get_tags sul database non è riuscita. </translation> </message> <message> - <location filename="../file.c" line="176"/> + <location filename="../file.c" line="166"/> <source>Database connection failed '%s'. </source> <translation>Connessione al database fallita '%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>Interrogazione al database fallita '%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>La query get_cylinders sul database non è riuscita. </translation> </message> <message> - <location filename="../parse-xml.c" line="2004"/> + <location filename="../parse-xml.c" line="2005"/> <source>Database query get_changes failed. </source> <translation>La query get_changes sul database non è riuscita. </translation> </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>La query get_profile_sample sul database non è riuscita. @@ -3097,28 +3241,29 @@ Media</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="2102"/> + <location filename="../parse-xml.c" line="2103"/> <source>Can't open stylesheet %s</source> <translation>Non é possibile aprire il foglio di stile %s</translation> </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>Non trovo il gas %d/%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>Troppe miscele gas</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 @@ -3131,47 +3276,47 @@ basato su GFlow = %.0f e 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>Transizione a %.*f %s in %d:%02d min - tempo %d:%02u su %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>Fermati a %.*f %s per %d:%02d min - tempo trascorso %d:%02u su %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Cambiare gas a %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Consumo gas: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f%s di %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> @@ -3180,335 +3325,338 @@ D:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1234"/> + <location filename="../profile.c" line="1229"/> <source>P: %d%s </source> <translation>P:%d%s </translation> </message> <message> - <location filename="../profile.c" line="1238"/> + <location filename="../profile.c" line="1233"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1244"/> + <location filename="../profile.c" line="1239"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1247"/> + <location filename="../profile.c" line="1242"/> <source>SAC: %2.1fl/min </source> <translation>SAC: %2.1fl/min </translation> </message> <message> - <location filename="../profile.c" line="1249"/> + <location filename="../profile.c" line="1244"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1251"/> + <location filename="../profile.c" line="1246"/> <source>pO%s: %.2fbar </source> <translation>pO₂%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1253"/> + <location filename="../profile.c" line="1248"/> <source>pN%s: %.2fbar </source> <translation>pN₂ %s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1255"/> + <location filename="../profile.c" line="1250"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1253"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </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>EAD: %d%s -END: %d%s -EADD: %d%s -</translation> + <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>Sosta di sicurezza: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1274"/> + <location filename="../profile.c" line="1279"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Sosta di sicurezza: </translation> </message> <message> - <location filename="../profile.c" line="1279"/> + <location filename="../profile.c" line="1284"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1282"/> + <location filename="../profile.c" line="1287"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: temo di sosta sconosciuto @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1286"/> + <location filename="../profile.c" line="1291"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1293"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1292"/> + <location filename="../profile.c" line="1297"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1300"/> + <location filename="../profile.c" line="1305"/> <source>In deco (calc) </source> <translation>In deco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1302"/> + <location filename="../profile.c" line="1307"/> <source>NDL: %umin (calc) </source> <translation>NDL:%umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1305"/> + <location filename="../profile.c" line="1310"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1313"/> <source>Calculated ceiling %.0f%s </source> <translation>Ceiling calcolato %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1314"/> + <location filename="../profile.c" line="1319"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tessuto %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1320"/> + <location filename="../profile.c" line="1325"/> <source>heartbeat: %d </source> <translation>Battito cardiaco: %d </translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1327"/> <source>bearing: %d </source> <translation>Direzione: %d </translation> </message> <message> - <location filename="../profile.c" line="1414"/> + <location filename="../profile.c" line="1419"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </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>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 immersioni)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 immersione)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>barca</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>riva</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>in corrente</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>profondo</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>caverna</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>ghiaccio</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>relitto</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>grotta</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>altitudine</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>piscina</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>lago</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>fiume</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>notte</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>acqua dolce</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>allievo</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>foto</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>istruttore</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>deco</translation> </message> @@ -3558,97 +3706,97 @@ EADD: %d%s <translation>(nessuna immersione)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>Dom</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Lun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>Mer</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Gio</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Ven</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>Sab</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Gen</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Mar</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>Mag</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Giu</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Lug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Set</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Ott</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Dic</translation> </message> diff --git a/translations/subsurface_lv_LV.ts b/translations/subsurface_lv_LV.ts index bc88a8128..6f2e68584 100644 --- a/translations/subsurface_lv_LV.ts +++ b/translations/subsurface_lv_LV.ts @@ -14,131 +14,137 @@ <message> <location filename="../qt-ui/models.cpp" line="69"/> <source>WorkPress</source> - <translation type="unfinished"/> + <translation>Darb.spied.</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="69"/> <source>StartPress</source> - <translation type="unfinished"/> + <translation>Sāk.spied.</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="69"/> <source>EndPress</source> - <translation type="unfinished"/> + <translation>Beig.spied.</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="69"/> <source>He%</source> - <translation type="unfinished"/> + <translation>He%</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="69"/> <source>O</source> + <translation>O</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="71"/> + <source>Switch at</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="158"/> + <location filename="../qt-ui/models.cpp" line="162"/> <source>Clicking here will remove this cylinder.</source> - <translation type="unfinished"/> + <translation>Noklikšķot šeit Jūs noņemsiet balonu.</translation> </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"/> + <translation>Balons never būt noņemts.</translation> </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>Šī gāze jau ir pielietota. Var noņemt tikai tos cilindrus, kuri nav pielietoti niršanā.</translation> </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>Es</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> + <translation>kub. pēda</translation> </message> </context> <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 type="unfinished"/> + <translation>Rediģēt niršanas datoru iesaukas</translation> </message> <message> <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="45"/> <source>Remove the selected Dive Computer?</source> - <translation type="unfinished"/> + <translation>Likvidēt izvēlētus datorus?</translation> </message> <message> <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/> <source>Are you sure that you want to remove the selected dive computer?</source> - <translation type="unfinished"/> + <translation>Vai Jūs esat pārliecināti ka gribat +likvidēt izvēlētus datorus?</translation> </message> </context> <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>Modelis</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>Ierīces ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Lietotājvārds</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"/> + <translation>Noklikšķot šeit Jūs noņemsiet niršanas datoru.</translation> </message> </context> <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>gaisa</translation> + <translation>gaiss</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>EAN%1</translation> </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 type="unfinished"/> + <translation>Pāreja uz 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>Kļūda: %1</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>beigas</translation> @@ -147,12 +153,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>gaisa</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>EAN%1</translation> </message> @@ -160,125 +166,130 @@ <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>l/min</translation> </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"/> + <translation>kub.pedas/min</translation> </message> </context> <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>Parādīt meklēšanas logu</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>izvērst visu</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>savērst visu</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>savērst pārējus</translation> </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"/> + <translation>noņemt niršanas reizi(-es) no ceļojuma</translation> </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"/> + <translation>izveidot jaunu ceļojumu augšup</translation> </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>nekavējoties pievienot niršanu(-as) ceļojumam augšup</translation> + </message> + <message> + <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="719"/> + <location filename="../qt-ui/divelistview.cpp" line="749"/> <source>merge trip with trip above</source> - <translation type="unfinished"/> + <translation>saplūdināt ceļojumu ar augšējo</translation> </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"/> + <translation>saplūdināt ceļojumu ar apakšējo</translation> </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"/> + <translation>izdzēst niršanu(-as)</translation> </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"/> + <translation>atzīmēt niršanu(-as) kā nepareizus</translation> </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"/> + <translation>saglabāt kā</translation> </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"/> - <source>shift times</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/divelistview.cpp" line="735"/> - <source>load images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/divelistview.cpp" line="738"/> - <source>upload dive(s) to divelogs.de</source> - <translation type="unfinished"/> + <translation>eksportēt kā UDDF</translation> </message> <message> <location filename="../qt-ui/divelistview.cpp" line="764"/> - <source>Save Dives As...</source> - <translation type="unfinished"/> + <source>shift times</source> + <translation>nobīdīt laikus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="765"/> + <source>load images</source> + <translation>ielādēt attēlus</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="768"/> + <source>upload dive(s) to divelogs.de</source> + <translation>augšupielādēt niršana(s) uz Divelogs.de</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="794"/> + <source>Save Dives As...</source> + <translation>Saglābāt niršanu kā...</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Saglabāt datni kā</translation> </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"/> + <translation>UDDF faili (*.uddf *.UDDF)</translation> </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"/> + <translation>Atvērt attēlus</translation> </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"/> + <translation>Attēlu faili (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="760"/> <source>merge selected dives</source> <translation>saplūdināt izvēlētas niršanas</translation> </message> @@ -288,34 +299,34 @@ <message> <location filename="../qt-ui/divelogimportdialog.ui" line="14"/> <source>Import dive log file</source> - <translation type="unfinished"/> + <translation>Niršanas žurnālu importēšana</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="36"/> <source>Import CSV Dive Log Files</source> - <translation type="unfinished"/> + <translation>CSV žurnālu imports</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="50"/> <source>CSV options</source> - <translation type="unfinished"/> + <translation>CSV opcijas</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="62"/> <location filename="../qt-ui/divelogimportdialog.ui" line="651"/> <source>Field Separator</source> - <translation type="unfinished"/> + <translation>Lauka atdalītājs</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="86"/> <source>Pre-configured imports</source> - <translation type="unfinished"/> + <translation>Importa veidnes</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="114"/> <location filename="../qt-ui/divelogimportdialog.ui" line="290"/> <source>Field Configuration</source> - <translation type="unfinished"/> + <translation>Lauka konfigurēšana</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="153"/> @@ -325,12 +336,12 @@ <message> <location filename="../qt-ui/divelogimportdialog.ui" line="173"/> <source>Stopdepth</source> - <translation type="unfinished"/> + <translation>Pieturas dziļums</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="180"/> <source>PO2</source> - <translation>PO2</translation> + <translation>PO₂</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="187"/> @@ -346,7 +357,7 @@ <message> <location filename="../qt-ui/divelogimportdialog.ui" line="224"/> <source>Cns</source> - <translation type="unfinished"/> + <translation>CNS</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="252"/> @@ -364,17 +375,17 @@ <location filename="../qt-ui/divelogimportdialog.ui" line="270"/> <location filename="../qt-ui/divelogimportdialog.ui" line="692"/> <source>Imperial</source> - <translation type="unfinished"/> + <translation>Imperiāls</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="278"/> <source>Manual dives</source> - <translation type="unfinished"/> + <translation>Roku niršanas</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="302"/> <source>Dive #</source> - <translation type="unfinished"/> + <translation>Niršana #</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="315"/> @@ -399,17 +410,17 @@ <message> <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> <source>Gps</source> - <translation type="unfinished"/> + <translation>GPS</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="393"/> <source>Max depth</source> - <translation type="unfinished"/> + <translation>Maks. dziļums</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="406"/> <source>Mean depth</source> - <translation type="unfinished"/> + <translation>Vid. dziļums</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="419"/> @@ -432,12 +443,12 @@ <message> <location filename="../qt-ui/diveplanner.ui" line="71"/> <source>Bottom SAC</source> - <translation type="unfinished"/> + <translation>Apakšējais SAC</translation> </message> <message> <location filename="../qt-ui/diveplanner.ui" line="85"/> <source>SAC on DECO Stop</source> - <translation type="unfinished"/> + <translation>SAC uz DECO apstāšanās</translation> </message> <message> <location filename="../qt-ui/diveplanner.ui" line="78"/> @@ -462,226 +473,232 @@ <message> <location filename="../qt-ui/diveplanner.ui" line="181"/> <source>ATM Pressure</source> - <translation type="unfinished"/> + <translation>Atmosfēras spiediens</translation> </message> </context> <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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30ft</translation> </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"/> + <translation>Apstrādātāja pozicijas kļūda</translation> </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"/> + <translation>Viena vai vairākas pieturas pazudīs pēc šīs operācijas, +Lūdzu, sākumā likvidējiet tos.</translation> </message> </context> <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>Gaisa</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Gala dziļums</translation> </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>Ilgums</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"/> + <translation>Izmantojama gāze</translation> </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"/> + <translation>CC regulēšana</translation> </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"/> + <translation>Atcelt plānu?</translation> </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"/> + <translation>Jūs taisāties atcelt plānu.</translation> </message> </context> <context> <name>DivePlannerWidget</name> - <message> - <location filename="../qt-ui/diveplanner.cpp" line="933"/> - <source>Dive Planner Points</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> - <source>Available Gases</source> - <translation type="unfinished"/> - </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="954"/> + <source>Dive Planner Points</source> + <translation>Niršanas vietas.</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> + <source>Available Gases</source> + <translation>Pieejamas gāzes</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="983"/> <source>add dive data point</source> - <translation type="unfinished"/> + <translation>pievienot niršanas vietu</translation> </message> </context> <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>Dziļums</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>Laiks</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>Spiediens</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>Temperatūra</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"/> + <translation>Krāsa</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <source>User Entered</source> + <translation>Ievādīts lietotājs</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> - <source>User Entered</source> - <translation type="unfinished"/> + <source>Cylinder Index</source> + <translation>Balona indekss</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> - <source>Cylinder Index</source> - <translation type="unfinished"/> + <source>Pressure S</source> + <translation>Spiediens S</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> - <source>Pressure S</source> - <translation type="unfinished"/> + <source>Pressure I</source> + <translation>Spiediens I</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> - <source>Pressure I</source> - <translation type="unfinished"/> + <source>Ceiling</source> + <translation>Maksimāla dekompr. pietura</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> - <source>Ceiling</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <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"/> + <translation>pN₂</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <source>PHE</source> + <translation>PHe</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> - <source>PHE</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>PO2</source> - <translation>PO2</translation> + <translation>PO₂</translation> </message> </context> <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>datums</translation> </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> + <translation>pedas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1300"/> + <location filename="../qt-ui/models.cpp" line="1317"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</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> + <translation>mārciņa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1309"/> + <location filename="../qt-ui/models.cpp" line="1326"/> <source>suit</source> <translation>kostīms</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> - <translation type="unfinished"/> + <translation>balons</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>vieta</translation> </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>maxCNS</translation> </message> @@ -689,116 +706,117 @@ 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"/> + <translation>Nederīga servera atbilde</translation> </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>Gaidīja XML tagu 'DiveDateReader', bet saņēma '%1</translation> </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>Gaidīts XML tags 'DiveDates' nav atrasts</translation> </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"/> + <translation>Kļūdaina XML atbilde. Līnija %1: %2</translation> </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"/> + <translation>neviena niršana nebija izvēlēta</translation> </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> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> <source>internal error</source> - <translation type="unfinished"/> + <translation>iekšēja kļūda</translation> </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"/> + <translation>Izdarīts</translation> </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"/> + <translation>Augšupielādē niršanas sarakstu...</translation> </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"/> + <translation>Niršanas saraksta lejupielādēšana...</translation> </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"/> - <source>Download finished - %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> - <source>Corrupted download</source> - <translation type="unfinished"/> + <translation>Lejupielādē %1 niršanas...</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> + <source>Download finished - %1</source> + <translation>Lejupielādēšana pabeigta - %1</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> + <source>Corrupted download</source> + <translation>Bojāta lejupielādēšana</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="800"/> <source>The archive could not be opened: %1</source> - <translation type="unfinished"/> + <translation>Nevar atvērt arhīvu: +%1</translation> </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"/> + <translation>Augšupielādēšana neizdodas</translation> </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"/> + <translation>Sekmīga augšupielādēšana</translation> </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"/> + <translation>Pieteikšanās neizdevās</translation> </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"/> + <translation>Nevar noparsēt atbildi</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Kļūda: %1</translation> </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"/> + <translation>Augšupielādēšana ir pabeigta</translation> </message> </context> <context> @@ -807,7 +825,7 @@ Please, remove them first.</source> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> <source>OK</source> - <translation>Viss kārtībā</translation> + <translation>OK</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/> @@ -818,22 +836,22 @@ Please, remove them first.</source> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Retry</source> - <translation type="unfinished"/> + <translation>Atkārtot</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/> <source>Find Uemis dive computer</source> - <translation type="unfinished"/> + <translation>Atrast Uemis niršanas datoru</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/> <source>Choose file for divecomputer download logfile</source> - <translation type="unfinished"/> + <translation>Izvēliet failu priekš žurnāla lejupielādēšanas no niršanas datora</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Log files (*.log)</source> - <translation type="unfinished"/> + <translation>Žurnalēšanas faili (*.log)</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/> @@ -843,17 +861,17 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> - <translation type="unfinished"/> + <translation>Saglabājot izraksti, niršanas NEsaglabājas niršanas sarakstā.</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/> <source>Choose file for divecomputer binary dump file</source> - <translation type="unfinished"/> + <translation>Izvēliet failu priekš niršanas datora bināra izraksta</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Dump files (*.bin)</source> - <translation type="unfinished"/> + <translation>Izraksta faili (*.bin)</translation> </message> </context> <context> @@ -876,7 +894,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/> <source>Device or Mount Point</source> - <translation type="unfinished"/> + <translation>Ierīce via montēšanas vieta</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/> @@ -908,18 +926,18 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/> <source>Save libdivecomputer logfile</source> - <translation type="unfinished"/> + <translation>Saglabāt libdivecomputer žurnālu</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/> <source>Save libdivecomputer dumpfile</source> - <translation type="unfinished"/> + <translation>Saglabāt libdivecomputer izraksta failu</translation> </message> </context> <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>Rediģēt izvēlētas niršanas vietas</translation> </message> @@ -928,13 +946,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>Niršanas piezīmes</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>Vieta</translation> </message> @@ -960,13 +978,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"/> + <translation>Gaisa temp.</translation> </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>Ūdens temp.</translation> </message> @@ -992,7 +1010,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>Piezīmes</translation> </message> @@ -1019,7 +1037,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/maintab.ui" line="433"/> <source>Gases Used</source> - <translation type="unfinished"/> + <translation>Izmant. gāzes</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="452"/> @@ -1123,13 +1141,13 @@ Please, remove them first.</source> <translation>Pievienot svara sistēmu</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Ceļojuma vieta</translation> </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>Ceļojuma piezīmes</translation> </message> @@ -1143,62 +1161,62 @@ Please, remove them first.</source> <source>Cancel</source> <translation>Dzēst</translation> </message> - <message> - <location filename="../qt-ui/maintab.cpp" line="232"/> - <source>Air temp [%1]</source> - <translation type="unfinished"/> - </message> <message> <location filename="../qt-ui/maintab.cpp" line="233"/> + <source>Air temp [%1]</source> + <translation>Gaisa temp. [%1]</translation> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="234"/> <source>Water temp [%1]</source> - <translation type="unfinished"/> + <translation>Ūdens temp. [%1]</translation> </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"/> + <translation>Ceļojuma rediģēšana.</translation> </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"/> + <translation>Daudzkārtīga ceļojumu rediģēšana.</translation> </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"/> + <translation>Niršanas rediģēšana.</translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>nezināms</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1006"/> + <location filename="../qt-ui/maintab.cpp" line="1054"/> <source>N</source> <translation>Z</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1006"/> + <location filename="../qt-ui/maintab.cpp" line="1054"/> <source>S</source> <translation>D</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>E</source> <translation>A</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>W</source> <translation>R</translation> </message> @@ -1206,256 +1224,276 @@ 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>Filtrs</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"/> + <translation>&Fails</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> - <translation type="unfinished"/> + <translation>&Žurnāls</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> - <translation type="unfinished"/> + <translation>&Skats</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> - <translation type="unfinished"/> + <translation>&Palīdzība</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> - <translation type="unfinished"/> + <translation>&Imports</translation> </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"/> + <translation>&Jauns žunāls</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Jauns</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </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"/> + <translation>&Atvērt žurnālu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Atvērt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> - <translation type="unfinished"/> + <translation>&Saglabāt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Saglabāt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Saglabāt kā</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>Ctrl+Shift+S</translation> </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>Aizvērt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+w</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+l</translation> </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"/> + <translation>Eksportēt &UDDF</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="138"/> <source>Enable the pN2 Graph</source> - <translation type="unfinished"/> + <translation>Parādīt pN₂ grafiku</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="164"/> <source>Enable the pHe graph</source> - <translation type="unfinished"/> + <translation>Parādīt pHe grafiku</translation> </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>Parādīt EAD, END un EADD</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Show NDL / TTS</source> - <translation type="unfinished"/> + <translation>Parādīt NDL / TTS</translation> </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"/> + <translation>Manīt asa mērogu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="681"/> + <location filename="../qt-ui/mainwindow.ui" line="709"/> <source>Ctrl+U</source> + <translation>Ctrl+U</translation> + </message> + <message> + <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="686"/> + <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"/> + <translation>&Drukāt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> - <translation type="unfinished"/> + <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> - <translation type="unfinished"/> + <translation>&Pabeigt</translation> </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"/> + <translation>Importēt no &niršanas datora</translation> </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"/> + <translation>Importēt &GPS datus no Subsurface servissa</translation> </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"/> + <translation>Ctrl+G</translation> </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"/> + <translation>&Rediģēt ierīces vārdu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> - <translation type="unfinished"/> + <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> - <translation type="unfinished"/> + <translation>&Pārnumurēt</translation> </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"/> + <translation>Ctrl+R</translation> </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"/> + <translation>&Gada statistika</translation> </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"/> + <translation>Ctrl+Y</translation> </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"/> + <translation>Niršanas saraksts</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Profils</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> - <translation type="unfinished"/> + <translation>Info</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"/> + <translation>Visi</translation> </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"/> + <translation>Lietotāja &apmācība</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> - <translation type="unfinished"/> + <translation>Karte</translation> </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"/> + <translation>Plānotājs</translation> </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"/> + <translation>Ctrl+L</translation> </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>Importēt no Divelogs.de</translation> + </message> + <message> + <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="689"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="112"/> <source>Enable the pO2 Graph</source> - <translation type="unfinished"/> + <translation>Parādīt pO₂ grafiku</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="115"/> @@ -1471,252 +1509,263 @@ 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>...</translation> </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"/> + <translation>Parādīt MOD</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="193"/> <source>Show the DC Reported Ceiling</source> - <translation type="unfinished"/> + <translation>Parādīt paziņotu maksimālu deko. pieturu</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="222"/> <source>Show the Calculated Ceiling</source> - <translation type="unfinished"/> + <translation>Parādīt aprēķināto maksimālo dekompr. pieturu</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="274"/> <source>Show Calculated Ceiling with 3m Increments</source> - <translation type="unfinished"/> + <translation>Parādīt aprēķināto maksimālo dekompr. pieturu ar 3m intervālu</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="248"/> <source>Calculate All Tissues</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.ui" line="378"/> - <source>Show SAC Rate</source> - <translation type="unfinished"/> + <translation>Aprēķināt visus audu līmeņus</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="404"/> + <source>Show SAC Rate</source> + <translation>Parādīt SAC</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="430"/> <source>Enable / Disable the Ruler</source> <translation>Ieslēgt / Izslēgt lienālu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Preferences</source> - <translation type="unfinished"/> + <translation>Priekšrocības</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Pievienot niršanu</translation> </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"/> + <translation>Auto-grupēšana</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>Iepr. DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Pa kreisi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>Nākamais DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Pa labi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Izvēlēt notikumus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> - <translation type="unfinished"/> + <translation>Ievādīt plānu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>Par Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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"/> + <translation>Importēt žurnalēšanas failu</translation> </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"/> + <translation>Importēt žurnālus no citām programmām</translation> </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"/> + <translation>Pilnekrāna režīms</translation> </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"/> + <translation>Pārslēgt pilnekrāna režīmu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="884"/> + <location filename="../qt-ui/mainwindow.ui" line="920"/> <source>F11</source> - <translation type="unfinished"/> + <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="143"/> + <location filename="../qt-ui/mainwindow.cpp" line="173"/> <source>Open File</source> <translation>Atvērt failu</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"/> + <translation>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms fails aizvēršanas.</translation> </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"/> + <translation>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms niršanas plānošanas.</translation> </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"/> + <translation>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms niršanas pievienošanas.</translation> </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>Vai velāties saglabāt izmaiņas datnē %1?</translation> </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>Vai velāties saglabāt izmaiņas datnes datu datnē?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Saglabāt izmaiņas?</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>Izmaiņas pazūs, ja tos nesaglabāt.</translation> </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>Saglabāt datni kā</translation> </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>Brīdinājums</translation> </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"/> + <translation>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms jauna faila atveršanas.</translation> </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>UDDF faili (*.uddf *.UDDF)</translation> + </message> + <message> + <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="395"/> + <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 type="unfinished"/> + <translation>Gada statistika</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>Subsurface XML datnes (*.ssrf *.xml *.XML)</translation> </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"/> + <translation>Atvērt niršanas žurnālu</translation> </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"/> + <translation>Niršanas žurnāla faili (*.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(*)</translation> </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"/> + <translation>Lūdzu, pabeidziet tekošo rediģēšanu pirms mēģinot citu.</translation> </message> </context> <context> @@ -1739,7 +1788,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> - <translation type="unfinished"/> + <translation>Valoda</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="141"/> @@ -1779,230 +1828,245 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/preferences.ui" line="214"/> <source>Default Cylinder</source> - <translation type="unfinished"/> + <translation>Noklusējamais balons</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="220"/> <source>Use Default Cylinder</source> - <translation type="unfinished"/> + <translation>Izmantot noklusējamo balonu</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="237"/> <source>Animations</source> - <translation type="unfinished"/> + <translation>Animācija</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="243"/> <source>Speed</source> + <translation>Ātrums</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="289"/> - <source>System</source> - <translation>Sistēma</translation> + <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="296"/> - <source>Metric</source> - <translation>Metrisks</translation> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="306"/> - <source>Imperial</source> + <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>Sistēma</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="323"/> + <source>Metric</source> + <translation>Metrisks</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="333"/> + <source>Imperial</source> + <translation>Imperiāls</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Personalizēt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Dziļums</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>metrs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> - <translation type="unfinished"/> + <translation>pēda</translation> </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>litrs</translation> </message> - <message> - <location filename="../qt-ui/preferences.ui" line="411"/> - <source>cu ft</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="428"/> - <source>celsius</source> - <translation type="unfinished"/> - </message> <message> <location filename="../qt-ui/preferences.ui" line="438"/> - <source>fahrenheit</source> - <translation type="unfinished"/> + <source>cu ft</source> + <translation>kub. pēda</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="455"/> + <source>celsius</source> + <translation>celsija</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="465"/> + <source>fahrenheit</source> + <translation>fārenheita</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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"/> + <translation>sliekšņu vērtība pO₂</translation> </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"/> + <translation>sliekšņu vērtība pN₂</translation> </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"/> + <translation>sliekšņu vērtība pHe</translation> </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"/> + <translation>maks ppO₂ parādot MOD</translation> </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"/> + <translation>attēlot niršanas datora paziņoto maks. dekompr. pieturu ar sarkano</translation> </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"/> + <translation>Sistēmas noklusējama iestādīšana</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Filtrs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Spiediens</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Tilpums</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Temperatūra</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Svars</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>Laika mērvienības</translation> </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"/> + <translation>Pacelšanas/nolaišanas ātruma saucējs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Minūtes</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Sekundes</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Parādīt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="707"/> - <source>GFLow at max depth</source> + <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="667"/> + <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>GFLow maks. dziļumā</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Dažāds</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> - <translation type="unfinished"/> + <translation>Priekšrocības</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GFHigh</translation> </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"/> + <translation>Ir nepieciešams restarts</translation> </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"/> + <translation>Lai pareizi atspoguļotu jaunu valodu Jums jārestartē Subsurface.</translation> </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>Atvērt noklusējamo žurnalēšanas datni</translation> </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>Subsurface XML datnes (*.ssrf *.xml *.XML)</translation> </message> @@ -2010,24 +2074,19 @@ 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"/> + <translation>&Priekšskatījums</translation> </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"/> + <translation>Drukāt</translation> </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"/> + <translation>Drukāt</translation> </message> </context> <context> @@ -2123,7 +2182,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/printoptions.ui" line="219"/> <source>Sizing heights (% of layout)</source> - <translation type="unfinished"/> + <translation>Elementu augstums (% no izkārtojuma) </translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="256"/> @@ -2133,7 +2192,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/printoptions.ui" line="278"/> <source>Other data height (8% - 17%)</source> - <translation type="unfinished"/> + <translation>Cits augstums (8% - 17%)</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="338"/> @@ -2151,72 +2210,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>nezināms</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>Niršana #%1 - %2</translation> </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>Maks. dziļums: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Ilgums: %1 min</translation> </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"/> + <translation>Lietojama gāze:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> - <translation type="unfinished"/> + <translation>SAC:</translation> </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"/> + <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> - <translation type="unfinished"/> + <translation>Krava:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Piezīmes:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Niršanas speciālists:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Draugs:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Kostīms:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> - <translation type="unfinished"/> + <translation>Redz.:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Novērtējums:</translation> </message> @@ -2224,42 +2283,77 @@ 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"/> + <translation>Pievienot gāzes maiņu</translation> </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"/> + <translation>Pievienot grāmatzīmi</translation> </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"/> + <translation>Noņemt notikumu</translation> </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>Paslēpt līdzīgus notikumus</translation> + </message> + <message> + <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="699"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="733"/> <source>Unhide all events</source> + <translation>Parādīt visus notikumus</translation> + </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>Gaisa</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"/> + <translation>Noņemt šo vietu</translation> </message> <message> <location filename="../qt-ui/kmessagewidget.cpp" line="58"/> @@ -2267,22 +2361,22 @@ Please, remove them first.</source> <translation>Aizvērt</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Vidējais</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Minimums</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Maksimums</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>Pārvietojiet karti un klikšķiet divreiz, lai atzīmētu niršanas vietu</translation> </message> @@ -2290,12 +2384,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>Pārnumurēt</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>Jauns sākuma skaitlis</translation> </message> @@ -2303,80 +2397,96 @@ 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"/> + <translation>Nobīdīt izvēlētus laikus</translation> </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"/> + <translation>Nobīdīt attēls(-u) laikus uz</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="99"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="102"/> <source>earlier</source> <translation>agrāk</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>vēlāk</translation> </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"/> - <source>Determine camera time offset</source> - <translation type="unfinished"/> + <translation>Lai izskaitļotu laika nobīdi starp niršanas datora un kameras, nofotagrafējiet niršanas datora displeju ar tekošo laiku. Lejupielādējiet attēlu datorā un nospiediet šo pogu.</translation> </message> <message> <location filename="../qt-ui/shiftimagetimes.ui" line="155"/> + <source>Determine camera time offset</source> + <translation>Noteikit kameras laika nobīdi</translation> + </message> + <message> + <location filename="../qt-ui/shiftimagetimes.ui" line="158"/> <source>Select image of divecomputer showing time</source> - <translation type="unfinished"/> + <translation>Izvēlēt attēlu ar niršanas datoru, kurš parāda laiku</translation> </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"/> + <translation>Kurš datums un laiks ir attēlots?</translation> </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"/> + <translation>Atvērt attēla failu</translation> </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"/> + <translation>Attēlu faili (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> </context> <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"/> + <translation>Nobīdīt izvēlētus laikus</translation> </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>Nobīdīt izvēlētus niršanas laikus pēc</translation> + </message> + <message> + <location filename="../qt-ui/shifttimes.ui" line="72"/> + <source>Shifted time:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="73"/> + <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"/> + <translation>h:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>agrāk</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>vēlāk</translation> </message> @@ -2401,53 +2511,53 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/about.ui" line="94"/> <source>&Close</source> - <translation type="unfinished"/> + <translation>Azivērt</translation> </message> <message> <location filename="../qt-ui/about.cpp" line="12"/> <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation type="unfinished"/> + <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multiplatformu niršanas žurnāla programmatūra<br><span style='font-size: 8pt'>Linuss Torvaldss, Dirks Hondels, Tomazs Kanabravas, un citi, 2011-2014</span></translation> </message> </context> <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>Tīmekļserviss</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> - <translation type="unfinished"/> + <translation>Pieslēdzas...</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"/> + <translation>Lajupielādēšana pabeigta</translation> </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"/> + <translation>Lejupielādēšanas kļūda: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Savienojuma Kļūda:</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>Nepareizs lietotāja identifikators!</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>Nevar saparsēt atbildi!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Lejupielādēšana ir sekmīga!</translation> </message> @@ -2463,17 +2573,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>Apraksts</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2486,28 +2596,71 @@ Please, remove them first.</source> <translation>Informācija</translation> </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"/> <source>User Manual</source> - <translation type="unfinished"/> + <translation>Lietotāja rokasgrāmata</translation> </message> <message> <location filename="../qt-ui/usermanual.cpp" line="31"/> <source>Cannot find the Subsurface manual</source> - <translation type="unfinished"/> + <translation>Nevar atrast Subsurface rokasgrāmatu</translation> </message> </context> <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>Apraksts</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2517,83 +2670,88 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/webservices.ui" line="14"/> <source>Webservice Connection</source> - <translation type="unfinished"/> + <translation>Tīkla servisa pieslēgšana</translation> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> <source>Status:</source> - <translation type="unfinished"/> + <translation>Statuss:</translation> </message> <message> <location filename="../qt-ui/webservices.ui" line="32"/> <source>Enter your ID here</source> - <translation type="unfinished"/> + <translation>Ievādiet Jūsu ID šeit:</translation> </message> <message> <location filename="../qt-ui/webservices.ui" line="44"/> <source>Download</source> - <translation type="unfinished"/> + <translation>Lejupielādēt</translation> </message> <message> <location filename="../qt-ui/webservices.ui" line="68"/> <source>User ID</source> - <translation type="unfinished"/> + <translation>Lietotāja ID</translation> </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>Parole</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"/> + <translation>Augšupielādēt</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/> <source>Operation timed out</source> - <translation type="unfinished"/> + <translation>Procesa izpilīdšanas laiks pārsniedza robežus</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/> <source>Transfering data...</source> - <translation type="unfinished"/> + <translation>Datu pārvietošana...</translation> </message> </context> <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>Tips</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Svars</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"/> + <translation>Noklikšķot šeit Jūs noņemsiet svara sistēmu.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</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> + <translation>mārciņa</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> + <translation>pēda</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,78 +2759,79 @@ 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"/> + <translation>Gads +> Mēnesis / Ceļojums</translation> </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>Ilgums Kopā</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> Vidējais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> Īsakais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> Garākais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Dziļums (%1) Vidējais</translation> </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> Minimums</translation> </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> Maksimums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Vidējais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2682,72 +2841,72 @@ Vidējais</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="57"/> + <location filename="../dive.c" line="58"/> <source>pascal</source> <translation>paskāls</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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) vai (%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> @@ -2766,699 +2925,739 @@ Vidējais</translation> <message> <location filename="../equipment.c" line="172"/> <source>ankle</source> - <translation type="unfinished"/> + <translation>svars uz kājām</translation> </message> <message> <location filename="../equipment.c" line="173"/> <source>backplate weight</source> - <translation type="unfinished"/> + <translation>svars uz plātni</translation> </message> <message> <location filename="../equipment.c" line="174"/> <source>clip-on</source> - <translation type="unfinished"/> + <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>Neizdevas nolasīt '%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"/> + <translation>Maksimālais atbalstītais stabu skaits CSV importēšanai ir %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>neviens</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> - <translation type="unfinished"/> + <translation>deko pietura</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>stāvums</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> - <translation>maksimālais augstums</translation> + <translation>maksimāla dekompr. pietura</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>darba slodze</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>raidītājs</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>pārkapšana</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>grāmatzīme</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>virsma</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>drošības pietura</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 type="unfinished"/> + <translation>gāzes maiņa</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>drošības pietura (brīvprātīga)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>drošības pietura (obligāta)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> - <translation type="unfinished"/> + <translation>dziļa pietura</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> - <translation type="unfinished"/> + <translation>maksimāla dekompr. pietura (drošības pietura)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> - <translation type="unfinished"/> + <translation>niršanas laiks</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"/> + <translation>zemāk par grīdu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> - <translation type="unfinished"/> + <translation>maks. dziļums</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> + <translation>PO₂</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> - <translation type="unfinished"/> + <translation>skābekļa laiks</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 type="unfinished"/> + <translation>virziens</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> - <translation type="unfinished"/> + <translation>audu līmeņa brīdinājums</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> - <translation type="unfinished"/> + <translation>bes apstāšanas laiks</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> - <translation type="unfinished"/> + <translation>kļūdains notikuma numurs</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 type="unfinished"/> + <translation>Nav iespējams izveidot parsētāju priekš %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> - <translation type="unfinished"/> + <translation>Kļūda reģistrējot datus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> - <translation>Kļūda laika parsēšanā</translation> + <translation>Kļūda parsējot laiku</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> - <translation type="unfinished"/> + <translation>Niršana %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 type="unfinished"/> + <translation>Kļūda parsējot niršanas laiku</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> - <translation type="unfinished"/> + <translation>Kļūda parsējot maks. dziļumu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> - <translation type="unfinished"/> + <translation>Kļūda parsējot gāzes maisījuma daudzumu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> - <translation type="unfinished"/> + <translation>Kļūda ūdens sāļuma noteikšanā</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> - <translation type="unfinished"/> + <translation>Kļūda spiediena noteikšanā uz virsmu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> - <translation type="unfinished"/> + <translation>Kļūda parsējot gāzes maisījumu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> - <translation type="unfinished"/> + <translation>Kļūda parsējot paraugus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> - <translation type="unfinished"/> + <translation>Notikums: gaida lietotāja darbību</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 type="unfinished"/> + <translation>modelis=%u (0x%08x), aparātprogrammatūra=%u (0x%08x), serial numurs=%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 type="unfinished"/> + <translation>Kļūda reģistrējot notikumu apstrādātāju.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> - <translation type="unfinished"/> + <translation>Error registering the cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> - <translation type="unfinished"/> + <translation>Kļūda importējot niršanas datus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> - <translation type="unfinished"/> + <translation>Nav iespējams izveidot libdivecomputer kontekstu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> - <translation type="unfinished"/> + <translation>Nevar atvērt %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 type="unfinished"/> + <translation>Dīvaina procentu nolasīšana %s +</translation> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> - <translation type="unfinished"/> + <translation>Kļūme parsējot '%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 type="unfinished"/> + <translation>Kļūme datubāzes vaicājumā get_events. +</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"/> + <translation>Neizdevas datubāzes pieprasījums get_tags. +</translation> </message> <message> - <location filename="../file.c" line="176"/> + <location filename="../file.c" line="166"/> <source>Database connection failed '%s'. </source> - <translation type="unfinished"/> + <translation>Kļūme savienojoties ar datubāzi '%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 type="unfinished"/> + <translation>Kļūme vaicājot datubāzi '@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"/> + <translation>Neizdevas datubāzes pieprasījums get_cylinders. +</translation> </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"/> + <translation>Neizdevas datubāzes pieprasījums get_changes. +</translation> </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"/> + <translation>Neizdevas datubāzes pieprasījums get_profile_sample. +</translation> </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"/> + <translation>Nevar atvērts stila lapu %s</translation> </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</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 type="unfinished"/> + <translation>Nevar atrast gāzi %d/%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> - <translation type="unfinished"/> + <translation>Parāk daudz gāzes maisījumu</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 </source> - <translation type="unfinished"/> + <translation>%s +Subsurface niršanas plāns +pamatojoties uz GFlow = %.0f un 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 type="unfinished"/> + <translation>Pāreja uz %.*f %s pēc %d:%02d min - izpildlaiks %d:%02u ar maisījumu %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 type="unfinished"/> + <translation>Apturēties uz %.*f %s uz %d:%02d min - izpildlaiks %d:%02u uz maisījuma %s +</translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> - <translation type="unfinished"/> + <translation>Pārslēgt gāzi uz %s +</translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> - <translation type="unfinished"/> + <translation>Gāzes patērēšana: +</translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f%s no %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"/> + <translation>@: %d:%02d +D: %.1f%s +</translation> </message> <message> - <location filename="../profile.c" line="1234"/> + <location filename="../profile.c" line="1229"/> <source>P: %d%s </source> - <translation type="unfinished"/> + <translation>S: %d%s +</translation> </message> <message> - <location filename="../profile.c" line="1238"/> + <location filename="../profile.c" line="1233"/> <source>T: %.1f%s </source> - <translation type="unfinished"/> + <translation>L: %.1f%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1239"/> + <source>V: %.1f%s +</source> + <translation>Ā: %.1f%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1242"/> + <source>SAC: %2.1fl/min +</source> + <translation>SAC: %2.1fl/min +</translation> </message> <message> <location filename="../profile.c" line="1244"/> - <source>V: %.1f%s -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1247"/> - <source>SAC: %2.1fl/min -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1249"/> <source>CNS: %u%% </source> - <translation type="unfinished"/> + <translation>CNS: %u%% +</translation> </message> <message> - <location filename="../profile.c" line="1251"/> + <location filename="../profile.c" line="1246"/> <source>pO%s: %.2fbar </source> - <translation type="unfinished"/> + <translation>pO%s: %.2fbar +</translation> + </message> + <message> + <location filename="../profile.c" line="1248"/> + <source>pN%s: %.2fbar +</source> + <translation>pN%s: %.2fbar +</translation> + </message> + <message> + <location filename="../profile.c" line="1250"/> + <source>pHe: %.2fbar +</source> + <translation>pHe: %.2fbar +</translation> </message> <message> <location filename="../profile.c" line="1253"/> - <source>pN%s: %.2fbar -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1255"/> - <source>pHe: %.2fbar -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1258"/> <source>MOD: %d%s </source> - <translation type="unfinished"/> + <translation>MOD: %d%s +</translation> </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"/> - <source>Safetystop: %umin @ %.0f%s + <location filename="../profile.c" line="1264"/> + <source>END: %d%s +EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1274"/> - <source>Safetystop: unkn time @ %.0f%s + <location filename="../profile.c" line="1276"/> + <source>Safetystop: %umin @ %.0f%s </source> - <translation type="unfinished"/> + <translation>Drošības apstāšana: %umin @ %.0f%s +</translation> </message> <message> <location filename="../profile.c" line="1279"/> + <source>Safetystop: unkn time @ %.0f%s +</source> + <translation>Drošības apstāšana: nez. laiks @ %.0f%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1284"/> <source>Deco: %umin @ %.0f%s </source> - <translation type="unfinished"/> + <translation>Dekompr.: %umin @ %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1282"/> + <location filename="../profile.c" line="1287"/> <source>Deco: unkn time @ %.0f%s </source> - <translation type="unfinished"/> + <translation>Dekompr.: nez. laiks @ %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1286"/> + <location filename="../profile.c" line="1291"/> <source>In deco </source> - <translation type="unfinished"/> + <translation>Dekompresijā +</translation> </message> <message> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1293"/> <source>NDL: %umin </source> - <translation type="unfinished"/> + <translation>NDL: %umin +</translation> </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"/> - <source>In deco (calc) -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1302"/> - <source>NDL: %umin (calc) -</source> - <translation type="unfinished"/> + <translation>Dekompr.: %umin @ %.0f%s (izrēķ.) +</translation> </message> <message> <location filename="../profile.c" line="1305"/> + <source>In deco (calc) +</source> + <translation>Dekompresijā (izrēķ.) +</translation> + </message> + <message> + <location filename="../profile.c" line="1307"/> + <source>NDL: %umin (calc) +</source> + <translation>NDL: %umin (izrēķ.) +</translation> + </message> + <message> + <location filename="../profile.c" line="1310"/> <source>TTS: %umin (calc) </source> - <translation type="unfinished"/> + <translation>TTS: %umin (izrēķ.) +</translation> </message> <message> - <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1313"/> <source>Calculated ceiling %.0f%s </source> - <translation type="unfinished"/> + <translation>Aprēķināta maks. dekompr. pietura %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1314"/> + <location filename="../profile.c" line="1319"/> <source>Tissue %.0fmin: %.0f%s </source> - <translation type="unfinished"/> + <translation>Audu līmenis %.0fmin: %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1320"/> + <location filename="../profile.c" line="1325"/> <source>heartbeat: %d </source> - <translation type="unfinished"/> + <translation>sirdspuksti: %d +</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1327"/> <source>bearing: %d </source> - <translation type="unfinished"/> + <translation>azimuts: %d +</translation> </message> <message> - <location filename="../profile.c" line="1414"/> + <location filename="../profile.c" line="1419"/> <source>%sT: %d:%02d min</source> - <translation type="unfinished"/> + <translation>%sT: %d:%02d min</translation> </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"/> + <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> - <translation type="unfinished"/> + <translation>%s %sD:%.1f%s +</translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> - <translation type="unfinished"/> + <translation>%s%sV:%.2f%s</translation> </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"/> + <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> - <translation type="unfinished"/> + <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> - <translation type="unfinished"/> + <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> - <translation type="unfinished"/> + <translation>F</translation> </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"/> + <translation>%1, %2 %3, %4 %5:%6</translation> </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"/> + <translation>%1 %2, %3 +%4:%5</translation> </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"/> + <translation>%1 %2 (%3 niršanas)</translation> </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"/> + <translation>%1 %2 (1 niršana)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>kuģis</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../dive.c" line="13"/> - <source>drift</source> - <translation type="unfinished"/> + <translation>krasts</translation> </message> <message> <location filename="../dive.c" line="14"/> + <source>drift</source> + <translation>straume</translation> + </message> + <message> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>dziļums</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>ala</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>ledus</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>šķembas</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>ala</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>augstiene</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> - <translation type="unfinished"/> + <translation>baseins</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>ezers</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>upe</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>nakts</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>svaigs</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>students</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>foto</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"/> + <translation>instruktors</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> - <translation type="unfinished"/> + <translation>dekompr.</translation> </message> <message> <location filename="../statistics.c" line="216"/> @@ -3468,7 +3667,7 @@ EADD: %d%s <message> <location filename="../statistics.c" line="222"/> <source>%dd %dh %dmin</source> - <translation type="unfinished"/> + <translation>%dd %dst %dmin</translation> </message> <message> <location filename="../statistics.c" line="224"/> @@ -3506,97 +3705,97 @@ EADD: %d%s <translation>(nav niršanas)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>Svēt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Pirm</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Otr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>Treš</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Cet</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Piekt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>Sest</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Mar</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>Maijs</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Jūn</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Jūl</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -3605,20 +3804,25 @@ EADD: %d%s <source>Uemis Zurich: File System is almost full Disconnect/reconnect the dive computer and click 'Retry'</source> - <translation type="unfinished"/> + <translation>Uemis Zurich: Failu sistēma ir gandrīz pilna +Atslēdziet/pieslēdziet niršanas datoru +un nospiediet 'Atkārtot'</translation> </message> <message> <location filename="../uemis-downloader.c" line="25"/> <source>Uemis Zurich: File System is full Disconnect/reconnect the dive computer and try again</source> - <translation type="unfinished"/> + <translation>Uemis Zurich: Failu sistēma ir gandrīz pilna +Atslēdziet/pieslēdziet niršanas datoru +un mēģiniet vēlreiz</translation> </message> <message> <location filename="../uemis-downloader.c" line="26"/> <source>Short write to req.txt file Is the Uemis Zurich plugged in correctly?</source> - <translation type="unfinished"/> + <translation>Pārtraukta req.txt faila ierakstīšana +Vai Uemis Zurich ir pareizi pieslēgts?</translation> </message> <message> <location filename="../uemis-downloader.c" line="107"/> @@ -3638,17 +3842,17 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../uemis-downloader.c" line="420"/> <source>divelog entry id</source> - <translation type="unfinished"/> + <translation>žurnāla pieraksta ID</translation> </message> <message> <location filename="../uemis-downloader.c" line="422"/> <source>divespot data id</source> - <translation type="unfinished"/> + <translation>niršanas vietas ID</translation> </message> <message> <location filename="../uemis-downloader.c" line="424"/> <source>more data dive id</source> - <translation type="unfinished"/> + <translation>Niršanas papilddatu ID</translation> </message> <message> <location filename="../uemis-downloader.c" line="618"/> @@ -3658,7 +3862,7 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../uemis-downloader.c" line="618"/> <source>semidry</source> - <translation type="unfinished"/> + <translation>pussauss</translation> </message> <message> <location filename="../uemis-downloader.c" line="618"/> @@ -3668,22 +3872,22 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../uemis-downloader.c" line="619"/> <source>shorty</source> - <translation type="unfinished"/> + <translation>īss</translation> </message> <message> <location filename="../uemis-downloader.c" line="619"/> <source>vest</source> - <translation type="unfinished"/> + <translation>veste</translation> </message> <message> <location filename="../uemis-downloader.c" line="619"/> <source>long john</source> - <translation type="unfinished"/> + <translation>kombinezons</translation> </message> <message> <location filename="../uemis-downloader.c" line="619"/> <source>jacket</source> - <translation type="unfinished"/> + <translation>jaka</translation> </message> <message> <location filename="../uemis-downloader.c" line="619"/> @@ -3703,77 +3907,77 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../uemis-downloader.c" line="802"/> <source>Init Communication</source> - <translation type="unfinished"/> + <translation>Sakaru inicializēšana</translation> </message> <message> <location filename="../uemis-downloader.c" line="804"/> <source>Uemis init failed</source> - <translation type="unfinished"/> + <translation>Kļūme inicializējot Uemis</translation> </message> <message> <location filename="../uemis-downloader.c" line="815"/> <source>Start download</source> - <translation type="unfinished"/> + <translation>Uzsākt lejupielādi</translation> </message> <message> <location filename="../uemis.c" line="196"/> <source>Safety Stop Violation</source> - <translation type="unfinished"/> + <translation>Drošības apstāšanas pārkāpšana</translation> </message> <message> <location filename="../uemis.c" line="198"/> <source>Speed Alarm</source> - <translation type="unfinished"/> + <translation>Trauksme: ātrums</translation> </message> <message> <location filename="../uemis.c" line="201"/> <source>Speed Warning</source> - <translation type="unfinished"/> + <translation>Brīdinājums: ātrums</translation> </message> <message> <location filename="../uemis.c" line="203"/> <source>PO2 Green Warning</source> - <translation type="unfinished"/> + <translation>Brīdinājums: PO₂ zaļš</translation> </message> <message> <location filename="../uemis.c" line="206"/> <source>PO2 Ascend Warning</source> - <translation type="unfinished"/> + <translation>Brīdinājums: PO₂ pacelšanas laikā</translation> </message> <message> <location filename="../uemis.c" line="208"/> <source>PO2 Ascend Alarm</source> - <translation type="unfinished"/> + <translation>Trauksme: PO₂ pacelšanas laikā</translation> </message> <message> <location filename="../uemis.c" line="212"/> <source>Tank Pressure Info</source> - <translation type="unfinished"/> + <translation>Balona spiediena info</translation> </message> <message> <location filename="../uemis.c" line="214"/> <source>RGT Warning</source> - <translation type="unfinished"/> + <translation>Brīdinājums: RGT</translation> </message> <message> <location filename="../uemis.c" line="216"/> <source>RGT Alert</source> - <translation type="unfinished"/> + <translation>Trauksme: RGT</translation> </message> <message> <location filename="../uemis.c" line="218"/> <source>Tank Change Suggested</source> - <translation type="unfinished"/> + <translation>Piedavāts mainīt balonu</translation> </message> <message> <location filename="../uemis.c" line="220"/> <source>Depth Limit Exceeded</source> - <translation type="unfinished"/> + <translation>Dziļuma limita pārsniegšana</translation> </message> <message> <location filename="../uemis.c" line="222"/> <source>Max Deco Time Warning</source> - <translation type="unfinished"/> + <translation>Brīdinājums: maks. dekompr. laiks</translation> </message> <message> <location filename="../uemis.c" line="224"/> @@ -3783,27 +3987,27 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../uemis.c" line="226"/> <source>Dive Time Alert</source> - <translation type="unfinished"/> + <translation>Trauksme: niršanas laiks</translation> </message> <message> <location filename="../uemis.c" line="228"/> <source>Marker</source> - <translation type="unfinished"/> + <translation>zīme</translation> </message> <message> <location filename="../uemis.c" line="230"/> <source>No Tank Data</source> - <translation type="unfinished"/> + <translation>Nav datu par balonu</translation> </message> <message> <location filename="../uemis.c" line="232"/> <source>Low Battery Warning</source> - <translation type="unfinished"/> + <translation>Brīdinājums: mazs baterijas lādiņš</translation> </message> <message> <location filename="../uemis.c" line="234"/> <source>Low Battery Alert</source> - <translation type="unfinished"/> + <translation>Trauksme: mazs baterijas lādiņš</translation> </message> </context> </TS> \ No newline at end of file diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index 3d5f09f6b..699e29676 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -37,37 +37,42 @@ <translation>O</translation> </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>Klikk her for å fjerne denne flaska.</translation> </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>Flaska kan ikke fjernes</translation> </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>Denne gassen er i bruk. Du kan bare fjerne flasker som ikke er i bruk.</translation> </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>ft³</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>Rediger navn for dykkecomputer</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>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>Enhets-ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Navn</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>Klikk her for å fjerne denne computeren.</translation> </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>luft</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>EAN%1</translation> </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>Bytter til 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> start</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> slutt</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>luft</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>EAN%1</translation> </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>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation>ft³/min</translation> </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>Vis søkeboks</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>vis alle turer</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>slå sammen alle turer</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>slå sammen andre turer</translation> </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>fjern dykk fra tur</translation> </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>legg til ny tur over denne</translation> </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>legg dykk til turen over</translation> </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>slå sammen tur med turen over</translation> </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>slå sammen tur med turen under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>slett dykk</translation> </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>merk dykk som skjult</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>lagre som</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>eksporter som UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>forskyvning av tidspunkter</translation> </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>last opp til divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>Lagre dykk som...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Lagre som</translation> </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>UDDF-filer (*.uddf *.UDDF)</translation> </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>slå sammen valgte dykk</translation> </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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Handler Position-feil</translation> </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>En eller flere av stoppene dine vil bli tapt hvis du fortsetter. @@ -493,37 +503,42 @@ Fjern dem før du gjør dette.</translation> <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>Luft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Dybde</translation> </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>Varighet</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Gass</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>CC setpoint</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation>Forkaste planen?</translation> </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>Du er i ferd med å forkaste planen.</translation> </message> @@ -531,17 +546,17 @@ Fjern dem før du gjør dette.</translation> <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>Punkter i dykkeplan</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>Tilgjengelige gasser</translation> </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>legg til datapunkt</translation> </message> @@ -549,72 +564,72 @@ Fjern dem før du gjør dette.</translation> <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>Dybde</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>Tid</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>Trykk</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>Temperatur</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>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>PO2</source> <translation>pO₂</translation> </message> @@ -622,67 +637,67 @@ Fjern dem før du gjør dette.</translation> <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>dato</translation> </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>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1309"/> + <location filename="../qt-ui/models.cpp" line="1326"/> <source>suit</source> <translation>drakt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>flaske</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>sted</translation> </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>maks CNS</translation> </message> @@ -690,43 +705,43 @@ Fjern dem før du gjør dette.</translation> <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>Ugyldig svar fra tjener</translation> </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>Forventet XML-tag 'DiveDateReader', men fikk '%1</translation> </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>Fant ikke XML-tag 'DiveDates' som forventet</translation> </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>Feil formattert XML-svar. Linje %1: %2</translation> </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> @@ -735,70 +750,70 @@ Fjern dem før du gjør dette.</translation> <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>Ferdig</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>Laster opp liste over dykk...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>Laster ned liste over dykk...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>Laster ned %1 dykk...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>Nedlasting er ferdig - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Nedlastingen er skadet</translation> </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>Arkivet kunne ikke åpnes: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>Opplasting feilet</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Ferdig å laste opp</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>Innlogging feilet</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>Kan ikke lese svar</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Feil: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Opplasting er ferdig</translation> </message> @@ -921,7 +936,7 @@ Fjern dem før du gjør dette.</translation> <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>Rediger valgte steder</translation> </message> @@ -930,13 +945,13 @@ Fjern dem før du gjør dette.</translation> <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>Dykk</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>Sted</translation> </message> @@ -962,13 +977,13 @@ Fjern dem før du gjør dette.</translation> </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>Lufttemp.</translation> </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>Vanntemp.</translation> </message> @@ -994,7 +1009,7 @@ Fjern dem før du gjør dette.</translation> </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>Notater</translation> </message> @@ -1125,13 +1140,13 @@ Fjern dem før du gjør dette.</translation> <translation>Legg til vektsystem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Tursted</translation> </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>Turnotater</translation> </message> @@ -1146,61 +1161,61 @@ Fjern dem før du gjør dette.</translation> <translation>Avbryt</translation> </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>Denne turen redigeres.</translation> </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>Flere dykk redigeres.</translation> </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>Dette dykket redigeres.</translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>ukjent</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>Ø</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>W</source> <translation>V</translation> </message> @@ -1208,109 +1223,109 @@ Fjern dem før du gjør dette.</translation> <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>Filter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>&Fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>&Logg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>&Vis</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>&Hjelp</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>&Importer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>&Ny loggbok</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Ny</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>Åpne l&oggbok</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Åpne</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>Lagre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Lagre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Lagre som</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>Ctrl+Shift+S</translation> </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>Lukk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>Eksporter &UDDF</translation> </message> @@ -1325,132 +1340,152 @@ Fjern dem før du gjør dette.</translation> <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>Ctrl+U</translation> </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>Skriv ut</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>Avslutt</translation> </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>Importer fra &dykkecomputer</translation> </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>Importer &GPS-data fra Subsurface-tjenesten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>Rediger &enhetsnavn</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>Nummere&r på nytt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>Årlig statistikk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Liste over dykk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>Bruker&manual</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Globus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>P&lanlegg dykk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>Importer fra divelogs.de</translation> </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>Ctrl+P</translation> </message> @@ -1473,11 +1508,12 @@ Fjern dem før du gjør dette.</translation> <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>...</translation> </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> @@ -1502,221 +1538,231 @@ Fjern dem før du gjør dette.</translation> <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>Valg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Nytt dyk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Autogruppering</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>Forrige DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Venstre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>Neste DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Høyre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Velg hendelser</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Legg inn plan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>Om Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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>Åpne fil</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>Lagre eller avbryt redigeringen før du lukker fila.</translation> </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>Lagre eller avbryt redigeringa før du planlegger et dykk.</translation> </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>Lagre eller avbryt redigeringa før du legger til et nytt dykk.</translation> </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>Vil du lagre endringene i %1?</translation> </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>Vil du lagre endringene?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Lagre endringer?</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>Endringer vil gå tapt hvis du ikke lagrer.</translation> </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>Lagre som</translation> </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>Advarsel</translation> </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>Lagre eller avbryt redigeringa før du åpner en ny fil.</translation> </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>UDDF-filer (*.uddf *.UDDF)</translation> </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>Årsstatistikk</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>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation> </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> @@ -1799,177 +1845,192 @@ Fjern dem før du gjør dette.</translation> <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>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Metrisk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Britiske mål</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Personaliser</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>fot</translation> </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>liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>ft³</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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>Standard for system</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Trykk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Volum</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="465"/> + <location filename="../qt-ui/preferences.ui" line="492"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="507"/> <source>Time units</source> <translation>Tidsenheter</translation> </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>Enhet for opp-/nedstigningshastighet</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Minutter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Sekunder</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Vis</translation> </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>GF lav ved maksdybde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Ymse</translation> </message> @@ -1979,32 +2040,32 @@ Fjern dem før du gjør dette.</translation> <translation>Valg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GF lav</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GF høy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>Programmet må startes på nytt</translation> </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>For å bytte språk må du starte Subsurface på nytt.</translation> </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>Åpne standardlogg</translation> </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>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation> </message> @@ -2012,22 +2073,17 @@ Fjern dem før du gjør dette.</translation> <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>Forhåndsvisning</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>Skriv ut</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>Lukk</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Skriv ut</translation> </message> @@ -2153,72 +2209,72 @@ Fjern dem før du gjør dette.</translation> <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>ukjent</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>Dykk nr. %1- %2</translation> </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>Max dybde: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Varighet: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Gass brukt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>Mac. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>Vekter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Notater:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Dykkeleder:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Drakt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> @@ -2226,40 +2282,75 @@ Fjern dem før du gjør dette.</translation> <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>Legg til gassbytte</translation> </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>Legg til bokmerke</translation> </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>Fjern hendelse</translation> </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>Skjul lignende hendelser</translation> </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>Luft</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>Fjern dette punktet</translation> </message> @@ -2269,22 +2360,22 @@ Fjern dem før du gjør dette.</translation> <translation>Lukk</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Gjennomsnitt</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Maksimum</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>Finn sted i kartet og dobbeltklikk for å sette posisjon</translation> </message> @@ -2292,12 +2383,12 @@ Fjern dem før du gjør dette.</translation> <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>Oppdater nummerering</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>Nytt startnummer</translation> </message> @@ -2305,52 +2396,52 @@ Fjern dem før du gjør dette.</translation> <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>Flytt valgte tidspunkter</translation> </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>tidligere</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>senere</translation> </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> @@ -2358,27 +2449,43 @@ Fjern dem før du gjør dette.</translation> <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>Flytt valgte tidspunkter</translation> </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>Flytt valgte tidspunkter med</translation> </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>h:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>tidligere</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>senere</translation> </message> @@ -2414,42 +2521,42 @@ Fjern dem før du gjør dette.</translation> <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>Nettjeneste</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Kobler til...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>Nedlasting er ferdig</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>Feil ved nedlasting: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Feil med forbindelse</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>Ugyldig bruker-ID!</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>Kan ikke lese svar!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Ferdig å laste ned</translation> </message> @@ -2465,17 +2572,17 @@ Fjern dem før du gjør dette.</translation> <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>Beskrivelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2488,6 +2595,49 @@ Fjern dem før du gjør dette.</translation> <translation>Informasjon</translation> </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> @@ -2504,12 +2654,12 @@ Fjern dem før du gjør dette.</translation> <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>Beskrivelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2543,11 +2693,16 @@ Fjern dem før du gjør dette.</translation> </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>Passord</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Last opp</translation> </message> @@ -2565,37 +2720,37 @@ Fjern dem før du gjør dette.</translation> <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>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Vekt</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>Klikk her for å fjerne dette vektsystemet</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="442"/> + <location filename="../qt-ui/models.cpp" line="454"/> <source>lbs</source> <translation>pund</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> @@ -2603,79 +2758,79 @@ Fjern dem før du gjør dette.</translation> <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>År > Måned / Tur</translation> </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>Varighet Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> Snitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> Kortest</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> Lengst</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Dybde (%1) Snitt</translation> </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> Minimum</translation> </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> Maksimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Snitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2685,72 +2840,72 @@ Snitt</translation> <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>ft³</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>pund</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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%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> @@ -2782,250 +2937,246 @@ Snitt</translation> <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>Kunne ikke åpne '%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>Maks antall kolonner i CSV-importen er %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>ingen</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>dekostopp</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>oppstigning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>tak</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>arbeidsbelastning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>sender</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>brudd</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>bokmerke</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>overflate</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>sikkerhetsstopp</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>gassbytte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>sikkerhetsstopp (frivillig)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>sikkerhetsstopp (obligatorisk)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>dypstopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>tak (sikkerhetsstopp)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>dykketid</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>under tak</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>maksdybde</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>pO₂</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>lufttid</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>retning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Advarsel: nivå i vev</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>tid uten stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>ugyldig hendelsesnummer</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>Kunne ikke lage parser for %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Feil ved registrering av data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Feil ved lesing av dato</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Dykk %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>Feil ved lesing av dykketid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Feil ved lesing av maksdybde</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Feil ved lesing av gassmiksantall</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Feil ved lesing av salthetsgrad</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Klarte ikke å hente overflatetrykk</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Feil ved lesing av gassmiks</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Feil ved lesing av detaljer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Hendelse: Venter på bruker</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>modell=%u (0x%08x), firmware=%u (0x%08x), serienr=%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>Feil ved registrering av hendelseshåndterer.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Feil ved registrering av avbruddshåndterer.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Feil ved import av dykkedata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>Kunne ikke opprette kontekst for libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Fikk ikke åpnet %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>Rar lesing av prosent %s @@ -3033,85 +3184,79 @@ Snitt</translation> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Kunne ikke lese '%s'. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Kunne ikke lese '%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>Databasespørring get_events feilet. </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>Databaseforbindelse feilet '%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>Databasespørring feilet '%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>Finner ikke gassen %d/%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>For mange gassmikser</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 @@ -3124,357 +3269,363 @@ basert på GF lav = %.0f og GF høy = %.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>Overgang til %.*f %s i %d:%02d min - kjøretid %d:%02u på %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>Bli ved %.*f %s i %d:%02d min - kjøretid %d:%02u på %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Bytt gass til %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Gasskonsum: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f%s på %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>%sT: %d:%02d min</translation> </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>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 dykk)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 dykk)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>båt</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>landdykk</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>strømdykk</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>dypdykk</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>hule</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>isdykk</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>vrakdykk</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>grotte</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>høydedykk</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>basseng</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>innsjø</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>elv</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>nattdykk</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>ferskvann</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>elev</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>foto</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>instruktør</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>deko</translation> </message> @@ -3524,97 +3675,97 @@ EADD: %d%s <translation>(ingen dykk)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>søn</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>man</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>tir</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>ons</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>tor</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>fre</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>lør</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>mar</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>mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>des</translation> </message> diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts index f0f04d9c3..ace87b4b4 100644 --- a/translations/subsurface_nl_NL.ts +++ b/translations/subsurface_nl_NL.ts @@ -37,37 +37,42 @@ <translation>O</translation> </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>Klik hier om de fles te verwijderen.</translation> </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>Fles kan niet verwijderd worden</translation> </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>Dit gas wordt gebruikt. Enkel flessen die niet gebruikt worden kunnen verwijderd worden.</translation> </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>Bewerk duikcomputer apparaatnamen</translation> </message> @@ -95,22 +100,22 @@ duikcomputer wilt verwijderen?</translation> <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>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>Toestel ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Apparaatnaam</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>Klik hier om deze duikcomputer te verwijderen.</translation> </message> @@ -118,28 +123,28 @@ duikcomputer wilt verwijderen?</translation> <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>lucht</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>EAN%1</translation> </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>Schakel om naar 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> begin</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> eind</translation> @@ -148,12 +153,12 @@ duikcomputer wilt verwijderen?</translation> <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>lucht</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>EAN%1</translation> </message> @@ -161,12 +166,12 @@ duikcomputer wilt verwijderen?</translation> <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>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation>cuft/min</translation> </message> @@ -174,112 +179,117 @@ duikcomputer wilt verwijderen?</translation> <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>Zoekvak Tonen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>alles uitklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>alles inklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>andere samenklappen</translation> </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>duik(en) uit trip verwijderen</translation> </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>nieuwe duik aanmaken hierboven</translation> </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>duik(en) toevoegen aan de trip hierboven</translation> </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>trip samenvoegen met trip hierboven</translation> </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>trip samenvoegen met trip hieronder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>duik(en) verwijderen</translation> </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>markeer duik(en) als ongeldig</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>bewaren Als</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>Als UDDF exporteren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>tijdstippen verschuiven</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="735"/> + <location filename="../qt-ui/divelistview.cpp" line="765"/> <source>load images</source> <translation>afbeeldingen laden</translation> </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>duik(en) laden op divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>Duiken Bewaren Als</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Bestand Bewaren als</translation> </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>UDDF bestanden (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="801"/> + <location filename="../qt-ui/divelistview.cpp" line="831"/> <source>Open Image Files</source> <translation>Afbeelding openen</translation> </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>Afbeeldingen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="760"/> <source>merge selected dives</source> <translation>geselecteerde duiken samenvoegen</translation> </message> @@ -469,22 +479,22 @@ duikcomputer wilt verwijderen?</translation> <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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Geleider Positie Fout</translation> </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>Een of meer stops zullen verloren gaan. @@ -494,37 +504,42 @@ Verwijder deze eerst.</translation> <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>AIR</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Eind diepte</translation> </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>Duur</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Verbruikt Gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation>Plan verwijderen?</translation> </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>U staat op het punt het plan te verwijderen</translation> </message> @@ -532,17 +547,17 @@ Verwijder deze eerst.</translation> <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>Duikplanner punten</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>Beschikbare Gassen</translation> </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>duik punt toevoegen</translation> </message> @@ -550,72 +565,72 @@ Verwijder deze eerst.</translation> <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>Diepte</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>Tijd</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>Druk</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>Temperatuur</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>Kleur</translation> </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>Ingevoerd door gebruiker</translation> </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>Fles index</translation> </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>Druk S</translation> </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>Druk I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Ceiling</source> <translation>Plafond</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>SAC</source> <translation>Gasverbruik</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>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>PHE</source> <translation>PHE</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>PO2</source> <translation>PO₂</translation> </message> @@ -623,67 +638,67 @@ Verwijder deze eerst.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1288"/> + <location filename="../qt-ui/models.cpp" line="1305"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1291"/> + <location filename="../qt-ui/models.cpp" line="1308"/> <source>date</source> <translation>datum</translation> </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>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>lbs</source> <translation>US pond</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1309"/> + <location filename="../qt-ui/models.cpp" line="1326"/> <source>suit</source> <translation>duikpak</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>fles</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>locatie</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1318"/> + <location filename="../qt-ui/models.cpp" line="1335"/> <source>SAC</source> <translation>Gasverbruik</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>max. CNS</translation> </message> @@ -691,44 +706,44 @@ Verwijder deze eerst.</translation> <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>Ongeldig antwoord van de server</translation> </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>XML etiket 'DiveDateReader' werd verwacht, maar kreeg '%1</translation> </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>Verwacht XML etket 'DiveDates' werd niet gevonden</translation> </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>Slecht gevormd XML antwoord. Lijn %1: %2</translation> </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>geen duiken geselecteerd</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> - <translation>kan zip bestand voor opladen niet aanmaken: %1</translation> + <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> - <translation>kan tijdelijk bestand niet aanmaken: %1</translation> + <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> - <translation>Interne fout: %1</translation> + <source>internal error: %s</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> @@ -736,70 +751,70 @@ Verwijder deze eerst.</translation> <translation>interne fout</translation> </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>Klaar</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>Duiklijst wordt opgeladen...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>Duiklijst wordt geladen...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>%1 duiken worden geladen...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>Download klaar - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Beschadigde download</translation> </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>Het archief kon niet geopend worden: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>Opladen mislukt</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Opladen gelukt</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>Login mislukt</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>Kan antwoord niet correct ontleden</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Fout: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Opladen klaar</translation> </message> @@ -922,7 +937,7 @@ Verwijder deze eerst.</translation> <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>Bewerk geselecteerde duiklocaties</translation> </message> @@ -931,13 +946,13 @@ Verwijder deze eerst.</translation> <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>Duiknotities</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>Locatie</translation> </message> @@ -963,13 +978,13 @@ Verwijder deze eerst.</translation> </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>Lucht temp</translation> </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>Water temp</translation> </message> @@ -995,7 +1010,7 @@ Verwijder deze eerst.</translation> </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>Notities</translation> </message> @@ -1126,13 +1141,13 @@ Verwijder deze eerst.</translation> <translation>Gewichtssysteem toevoegen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Trip locatie</translation> </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>Trip Nota's</translation> </message> @@ -1146,62 +1161,62 @@ Verwijder deze eerst.</translation> <source>Cancel</source> <translation>Annuleren</translation> </message> - <message> - <location filename="../qt-ui/maintab.cpp" line="232"/> - <source>Air temp [%1]</source> - <translation type="unfinished"/> - </message> <message> <location filename="../qt-ui/maintab.cpp" line="233"/> - <source>Water temp [%1]</source> - <translation type="unfinished"/> + <source>Air temp [%1]</source> + <translation>Lucht temp [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="234"/> + <source>Water temp [%1]</source> + <translation>Water temp [%1]</translation> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>This trip is being edited.</source> <translation>Deze trip wordt bewerkt.</translation> </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>Meerdere duiken worden bewerkt.</translation> </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>Deze duik wordt bewerkt.</translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>onbekend</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>Z</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>E</source> <translation>O</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> @@ -1209,249 +1224,269 @@ Verwijder deze eerst.</translation> <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>Filter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>Bestand</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>Toon</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>&Help</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>&Importeren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>&Nieuw logboek</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Nieuw</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>Logboek &Openen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Open</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>Bewaar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Opslaan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Opslaan als...</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>Ctrl+Shift+S</translation> </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>Sluiten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>&UDDF Exporteren</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="138"/> <source>Enable the pN2 Graph</source> - <translation type="unfinished"/> + <translation>Toon de pN2 grafiek</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="164"/> <source>Enable the pHe graph</source> + <translation>Toon de pHe grafiek</translation> + </message> + <message> + <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="326"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Enable EAD, END, and EADD</source> <translation>EAD, EED, END inschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Show NDL / TTS</source> - <translation type="unfinished"/> + <translation>Toon NDL / TTS</translation> </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"/> + <translation>Diepteschaal herschalen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="681"/> + <location filename="../qt-ui/mainwindow.ui" line="709"/> <source>Ctrl+U</source> <translation>Ctrl+U</translation> </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>Afdrukken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>Afsluiten</translation> </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>Importeren uit &duikcomputer</translation> </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>&GPS gegevens importeren van Subsurface Service</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>Namen toestellen wijzigen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>Hernummeren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>Jaarlijkse Statistieken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Duiklijst</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Profiel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Informatie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>Handleiding</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Wereldbol</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>Duik P&lannen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>Importeren van Divelogs.de</translation> </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>Ctrl+P</translation> </message> @@ -1474,11 +1509,12 @@ Verwijder deze eerst.</translation> <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>...</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="300"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>Enable MOD</source> <translation>MOD inschakelen</translation> </message> @@ -1503,221 +1539,231 @@ Verwijder deze eerst.</translation> <translation>Bereken alle compartimenten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="378"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>Show SAC Rate</source> <translation>Toon SAC</translation> </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>In-/Uitschakelen Meetlat</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Preferences</source> <translation>Instellingen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Duik Toevoegen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Automatisch Groeperen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>Vorige DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Links</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>Volgende DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Rechts</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>gebeurtenissen selecteren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Voer plan in</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>Over Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="859"/> + <location filename="../qt-ui/mainwindow.ui" line="895"/> <source>Import Log Files</source> <translation>Importeer logboeken</translation> </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>Importeer logboeken uit andere programma's</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="878"/> + <location filename="../qt-ui/mainwindow.ui" line="914"/> <source>&Full Screen</source> <translation>Volledig scherm</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="881"/> + <location filename="../qt-ui/mainwindow.ui" line="917"/> <source>Toggle Full Screen</source> <translation>Volledig Scherm in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="884"/> + <location filename="../qt-ui/mainwindow.ui" line="920"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="143"/> + <location filename="../qt-ui/mainwindow.cpp" line="173"/> <source>Open File</source> <translation>Bestand openen</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>Bewaar of maak de huidige wijziging ongedaan voor U het bestand sluit.</translation> </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>Bewaar of maak de huidige wijziging ongedaan voor U een duik plant.</translation> </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>Bewaar of maak de huidige wijziging ongedaan voor U een duik toevoegt.</translation> </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>Wilt u de wijzigingen in bestand %1 bewaren?</translation> </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>Wilt u de wijzigingen bijhouden in het bestand?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Aanpassingen opslaan?</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>Wijzigingen gaan verloren als u deze niet bewaart.</translation> </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>Bestand Bewaren als</translation> </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>Waarschuwing</translation> </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>Bewaar of maak de huidige wijziging ongedaan voor u een nieuw bestand opent.</translation> </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>UDDF bestanden (*.uddf *.UDDF)</translation> </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>Jaarlijkse statistieken</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>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation> </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>Open Duiklogboek</translation> </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>Duiklogboek bestanden (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Bestanden (*.xml);;UDDF/UDCF Bestanden (*.uddf *.udcf);;JDiveLog Bestanden (*.jlb);;Suunto Bestanden (*.sde *.db);;CSV Bestanden (*.csv);;All Bestanden (*)</translation> </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>Rond de huidige wijziging af vooraleer een volgende te beginnen.</translation> </message> @@ -1792,185 +1838,200 @@ Verwijder deze eerst.</translation> <message> <location filename="../qt-ui/preferences.ui" line="237"/> <source>Animations</source> - <translation type="unfinished"/> + <translation>Animaties</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="243"/> <source>Speed</source> + <translation>Snelheid</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="289"/> + <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>Systeem</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Metrisch</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Imperiaal</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Personaliseren</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Diepte</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>voet</translation> </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>liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>cu ft</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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>drempelwaarde wanneer pO₂ getoond wordt</translation> </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>drempelwaarde wanneer pN₂ getoond wordt</translation> </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>drempelwaarde wanneer pHe getoond wordt</translation> </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>max ppO₂ wanneer MOD getoond wordt</translation> </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>Toon door duikcomputer aangegeven plafond in rood</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="655"/> - <source>unused tanks</source> - <translation>niet gebruikte flessen</translation> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="723"/> + <location filename="../qt-ui/preferences.ui" line="747"/> <source>System Default</source> <translation>Systeem Standaardinstelling</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Druk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Temperatuur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="465"/> + <location filename="../qt-ui/preferences.ui" line="492"/> <source>lbs</source> <translation>US pond</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="507"/> <source>Time units</source> <translation>Tijdseenheden</translation> </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>Stijg-/daalsnelheid noemer</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Minuten</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Seconden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Toon</translation> </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>GFLow op max diepte</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Allerlei</translation> </message> @@ -1980,32 +2041,32 @@ Verwijder deze eerst.</translation> <translation>Instellingen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>Herstarten noodzakelijk</translation> </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>Om een nieuwe taal te laden dient u Subsurface te herstarten.</translation> </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>Standaard Logboek Openen</translation> </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>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation> </message> @@ -2013,22 +2074,17 @@ Verwijder deze eerst.</translation> <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>Voorbeeldweergave</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>Afd&rukken</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>Sluiten</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Afdrukken</translation> </message> @@ -2154,72 +2210,72 @@ Verwijder deze eerst.</translation> <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>onbekend</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>Duik #%1 - %2</translation> </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>Max diepte: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Duur: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Verbruikt gas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>Gasverbruik:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>Gewichten:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Nota's:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Duikpak:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Zichtbaarheid:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Beoordeling:</translation> </message> @@ -2227,40 +2283,75 @@ Verwijder deze eerst.</translation> <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>Gaswissel toevoegen</translation> </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>Bladwijzer toevoegen</translation> </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>Gebeurtenis verwijderen</translation> </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>Gelijkaardige gebeurtenissen verbergen</translation> </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>Toon alle gebeurtenissen</translation> </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>AIR</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>Dit punt verwijderen</translation> </message> @@ -2270,22 +2361,22 @@ Verwijder deze eerst.</translation> <translation>Sluiten</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Gemiddelde</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Kleinste</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Grootste</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>Verplaats de kaart en dubbelklikk om de duiklocatie te selecteren</translation> </message> @@ -2293,12 +2384,12 @@ Verwijder deze eerst.</translation> <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>Hernummeren</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>Nieuw beginnummer</translation> </message> @@ -2306,52 +2397,52 @@ Verwijder deze eerst.</translation> <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>Geselecteerde tijdsstippen verschuiven</translation> </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>Tijdsstip voor afbeelding(en) verschuiven met</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="99"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="102"/> <source>earlier</source> <translation>vroeger</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>later</translation> </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>Neem een foto van uw duikcomputer die de tijd aangeeft om het verschil tussen de klok van uw duikcomputer en uw camera te berekenen. Laad dat beeld op uw computer en druk op deze knop.</translation> </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>Bereken tijdsverschil met camera</translation> </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>Selecteer afbeelding van duikcomputer die de tijd aangeeft</translation> </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>Welke datum en tijd worden weergegeven in de afbeelding?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="181"/> + <location filename="../qt-ui/simplewidgets.cpp" line="203"/> <source>Open Image File</source> <translation>Afbeelding openen</translation> </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>Afbeeldingen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -2359,27 +2450,43 @@ Verwijder deze eerst.</translation> <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>Geselecteerde tijdsstippen verschuiven</translation> </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>Geselecteerde tijdsstippen verschuiven met</translation> </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>u:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>vroeger</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>later</translation> </message> @@ -2415,42 +2522,42 @@ Verwijder deze eerst.</translation> <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>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Verbinding wordt opgezet.</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>Download klaar</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>Download fout: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Verbindingsfout:</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>Ongeldige gebruikersidentificatie</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>Kan antwoord niet parsen!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Laden succesvol voltooid!</translation> </message> @@ -2466,17 +2573,17 @@ Verwijder deze eerst.</translation> <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>Beschrijving</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2489,6 +2596,49 @@ Verwijder deze eerst.</translation> <translation>Informatie</translation> </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> @@ -2505,12 +2655,12 @@ Verwijder deze eerst.</translation> <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>Beschrijving</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2544,11 +2694,16 @@ Verwijder deze eerst.</translation> </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>Wachtwoord</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Uploaden</translation> </message> @@ -2566,37 +2721,37 @@ Verwijder deze eerst.</translation> <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>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Gewicht</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>Hier klikken om het gewichtssysteem te verwijderen</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="442"/> + <location filename="../qt-ui/models.cpp" line="454"/> <source>lbs</source> <translation>US pond</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> @@ -2604,79 +2759,79 @@ Verwijder deze eerst.</translation> <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>Jaar > Maand / Trip</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1659"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1662"/> <source>Duration Total</source> <translation>Duur Totaal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> Gemiddeld</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> Kortste</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> Langste</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Diepte (%1) Gemiddeld</translation> </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> Minimum</translation> </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> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>Gasverbruik (%1) Gemiddeld</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2686,72 +2841,72 @@ Maximum</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="57"/> + <location filename="../dive.c" line="58"/> <source>pascal</source> <translation>Pa</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>US pond</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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) of (%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> @@ -2783,250 +2938,246 @@ Maximum</translation> <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>Fout bij lezen van '%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>Het maximum aantal kolommen bij CSV importeren is %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>geen</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>decompressiestop</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>opstijging</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>plafond</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>werklast</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>zender</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>schending</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>bladwijzer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>oppervlakte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>veiligheidsstop</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>gaswissel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>veiligheidsstop (vrijwillig)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>veiligheidsstop (verplicht)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>diepe stop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>plafond (veiligheidsstop)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>duiktijd</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>onder de vloer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Max. diepte</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>PO₂</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>resterende luchttijd</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>koers</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>waarschuwing stikstofbelasting</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>nultijd</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>ongeldig event-nummer</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>Kan geen parser creëren voor %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Fout bij het registreren van de data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Fout bij verwerken van de datum en tijd</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Duik nr. %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>Fout bij verwerken van de duikduur</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Fout bij het verwerken van de maximum duikdiepte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Fout bij het verwerken van het aantal gasmengsels</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Fout bij het verkrijgen van het zoutgehalte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Fout bij bekomen van oppervlaktedruk</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Fout bij het verwerken van het gasmengsel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Fout bij het verwerken van de samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Event: wachten op handeling van gebruiker</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>model=%u (0x%08x), firmware=%u (0x%08x), serienummer=%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>Fout bij het registreren van de event handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Fout bij het registreren van de cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Fout bij importeren van duikdata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>Kan geen context creëren voor libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Fout bij openen van %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>Vreemde percentage %s @@ -3034,89 +3185,83 @@ Maximum</translation> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Fout bij analyseren van '%s'. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Fout bij analyse van '%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>Database-query get_events mislukt. </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>Database query get_tags mislukt. </translation> </message> <message> - <location filename="../file.c" line="176"/> + <location filename="../file.c" line="166"/> <source>Database connection failed '%s'. </source> <translation>Databaseconnectie is mislukt '%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>Database-query mislukt: '%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>Database query get_cylinders mislukt. </translation> </message> <message> - <location filename="../parse-xml.c" line="2004"/> + <location filename="../parse-xml.c" line="2005"/> <source>Database query get_changes failed. </source> <translation>Database query get_changes mislukt. </translation> </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>Database query get_profile_sample mislukt. </translation> </message> <message> - <location filename="../parse-xml.c" line="2102"/> + <location filename="../parse-xml.c" line="2103"/> <source>Can't open stylesheet %s</source> <translation>Kan de stylesheet %s niet openen</translation> </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>Kan gasmengsel %d/%d niet vinden</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>Teveel gasmengsels</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 @@ -3129,47 +3274,47 @@ Gebaseerd op GFlow = %.0f en 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>Ga naar %.*f %s over %d:%02d min - looptijd %d:%02u op %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>Blijft op %.*f %s gedurende %d:%02d min - looptijd %d:%02u op %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Gaswissel naar %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Gasverbruik: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f%s %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> @@ -3178,336 +3323,339 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1234"/> + <location filename="../profile.c" line="1229"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1238"/> + <location filename="../profile.c" line="1233"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1244"/> + <location filename="../profile.c" line="1239"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1247"/> + <location filename="../profile.c" line="1242"/> <source>SAC: %2.1fl/min </source> <translation>SAC: %2.1fl/min </translation> </message> <message> - <location filename="../profile.c" line="1249"/> + <location filename="../profile.c" line="1244"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1251"/> + <location filename="../profile.c" line="1246"/> <source>pO%s: %.2fbar </source> <translation>pO₂%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1253"/> + <location filename="../profile.c" line="1248"/> <source>pN%s: %.2fbar </source> <translation>pN₂%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1255"/> + <location filename="../profile.c" line="1250"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1253"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </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>EAD: %d%s -END: %d%s -EADD: %d%s -</translation> + <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>Veiligheidsstop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1274"/> + <location filename="../profile.c" line="1279"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Veiligheidsstop: onbek tijd @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1279"/> + <location filename="../profile.c" line="1284"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1282"/> + <location filename="../profile.c" line="1287"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: onbek tijd @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1286"/> + <location filename="../profile.c" line="1291"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1293"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1292"/> + <location filename="../profile.c" line="1297"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (berekend) </translation> </message> <message> - <location filename="../profile.c" line="1300"/> + <location filename="../profile.c" line="1305"/> <source>In deco (calc) </source> <translation>In deco (berekend) </translation> </message> <message> - <location filename="../profile.c" line="1302"/> + <location filename="../profile.c" line="1307"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (berekend) </translation> </message> <message> - <location filename="../profile.c" line="1305"/> + <location filename="../profile.c" line="1310"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (berekend) </translation> </message> <message> - <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1313"/> <source>Calculated ceiling %.0f%s </source> <translation>Berekend plafond %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1314"/> + <location filename="../profile.c" line="1319"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Compartiment %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1320"/> + <location filename="../profile.c" line="1325"/> <source>heartbeat: %d </source> <translation>hartslag: %d </translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1327"/> <source>bearing: %d </source> <translation>koers: %d </translation> </message> <message> - <location filename="../profile.c" line="1414"/> + <location filename="../profile.c" line="1419"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </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>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 duiken)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 duik)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>boot</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>kust</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>drift</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>diep</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>spelonk</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>ijs</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>wrak</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>grot</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>hoogte</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>zwembad</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>meer</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>rivier</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>nacht</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>zoet</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>student</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>foto</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>instructeur</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>decompressie</translation> </message> @@ -3557,97 +3705,97 @@ EADD: %d%s <translation>(geen duiken)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>Zo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Ma</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Di</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>Wo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Do</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Vr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>Za</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>mar</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>mei</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>sept</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>dec</translation> </message> diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts index 9dc92d7e2..f4f905f68 100644 --- a/translations/subsurface_pl_PL.ts +++ b/translations/subsurface_pl_PL.ts @@ -37,37 +37,42 @@ <translation>O</translation> </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>Kliknięcie tu usunie butlę z listy.</translation> </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>Butla nie może być usunięta.</translation> </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>Ten gaz jest używany. Można usuwać tylko butle, których nie używasz.</translation> </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>Edycja nazw komputerów nurkowych</translation> </message> @@ -95,22 +100,22 @@ wybrany komputer nurkowy?</translation> <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>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>ID urządzenia</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Nazwa</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>Kliknięcie tu usunie komputer nurkowy.</translation> </message> @@ -118,28 +123,28 @@ wybrany komputer nurkowy?</translation> <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>powietrze</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>EAN%1</translation> </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>Przejście na obieg otwarty</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> początek</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> koniec</translation> @@ -148,12 +153,12 @@ wybrany komputer nurkowy?</translation> <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>powietrze</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>EAN%1</translation> </message> @@ -161,12 +166,12 @@ wybrany komputer nurkowy?</translation> <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> l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation> cuft/min</translation> </message> @@ -174,112 +179,117 @@ wybrany komputer nurkowy?</translation> <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>Pokaż okno wyszukiwania</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>rozwiń wszystkie</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>zwiń wszystkie</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>zwiń pozostałe</translation> </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>usuń nurkowanie(a) z grupy</translation> </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>utwórz nową grupę powyżej</translation> </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>dodaj nurkowanie(a) do grupy powyżej</translation> </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>połącz grupę z grupą powyżej</translation> </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>połącz grupę z grupą poniżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>usuń nurkowanie(a)</translation> </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>oznacz nurkowanie(a) jak niepoprawne</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>zapisz jako</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>eksportuj jako plik UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>zmień czas</translation> </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"/> + <translation>dodaj zdjęcia</translation> </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>Wyślij nurkowanie(a) do divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>Zapisz nurkowania jako...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Zapisz plik jako</translation> </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>Pliki UDDF (*.uddf *.UDDF)</translation> </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"/> + <translation>Dodawanie zdjęć</translation> </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"/> + <translation>Pliki graficzne (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="760"/> <source>merge selected dives</source> <translation>połącz wybrane nurkowania</translation> </message> @@ -289,17 +299,17 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="14"/> <source>Import dive log file</source> - <translation type="unfinished"/> + <translation>Importowanie logów nurkowych</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="36"/> <source>Import CSV Dive Log Files</source> - <translation type="unfinished"/> + <translation>Importuj plik CSV</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="50"/> <source>CSV options</source> - <translation type="unfinished"/> + <translation>Opcje CVS</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="62"/> @@ -370,12 +380,12 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="278"/> <source>Manual dives</source> - <translation type="unfinished"/> + <translation>Nurkowania dodane ręcznie</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="302"/> <source>Dive #</source> - <translation type="unfinished"/> + <translation>Nurkowanie #</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="315"/> @@ -400,17 +410,17 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> <source>Gps</source> - <translation type="unfinished"/> + <translation>Gps</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="393"/> <source>Max depth</source> - <translation type="unfinished"/> + <translation>Głębokość maksymalna</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="406"/> <source>Mean depth</source> - <translation type="unfinished"/> + <translation>Głębokość średnia</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="419"/> @@ -469,22 +479,22 @@ wybrany komputer nurkowy?</translation> <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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Niedozwolone położenie punktu</translation> </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>W wyniku tej operacji jeden lub więcej puntów znajdzie się @@ -494,37 +504,42 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>POWIETRZE</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Głębokość końcowa </translation> </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>Czas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Używany gaz</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation>Porzucić plan?</translation> </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>Masz zamiar porzucić plan</translation> </message> @@ -532,17 +547,17 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>Plan nurkowy</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>Dostępne gazy</translation> </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>dodaj punkt do profilu</translation> </message> @@ -550,72 +565,72 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>Głębokość</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>Czas</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>Ciśnienie</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>Temperatura</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"/> + <translation>Kolor</translation> </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"/> + <translation>numer butli</translation> </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"/> + <translation>Sufit</translation> </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"/> + <translation>PN2</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>PHE</source> <translation>pHe</translation> </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> @@ -623,67 +638,67 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>data</translation> </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>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</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>skafander</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>butla</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>miejsce</translation> </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>maxCNS</translation> </message> @@ -691,44 +706,44 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>Niepoprawna odpowiedź z serwera</translation> </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>Oczekiwano tagu XML 'DiveDateReader', zamiast tego odczytano '%1</translation> </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>Oczekiwany tag XML 'DiveDates' nie został znaleziony</translation> </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>Uszkodzona odpowiedź XML. Linia %1: %2</translation> </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>nie wybrano żadnych nurkowań</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> - <translation>nie udało się utworzyć pliku zip do wysłania: %1</translation> + <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> - <translation>nie można utworzyć pliku tymczasowego: %1</translation> + <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> - <translation>błąd wewnętrzny: %1</translation> + <source>internal error: %s</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> @@ -736,70 +751,70 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <translation>błąd wewnętrzny</translation> </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>Zakończ</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>Wysyłanie listy nurkowań...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>Pobieranie listy nurkowań...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>Pobieranie %1 nurkowań...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>Zakończono pobieranie - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Pobrano uskodzone dane</translation> </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>Archiwum nie mogło zostać otworzone: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>Wysyłanie nieudane</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Wysyłanie zakończone sukcesem</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>Błąd logowania</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>Nie można przetworzyć odpowiedzi</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Błąd: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Wysyłanie zakończone</translation> </message> @@ -826,7 +841,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/> <source>Find Uemis dive computer</source> - <translation type="unfinished"/> + <translation>Wykryj komputer Uemis</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/> @@ -922,7 +937,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>Wskaż miejsce zaznaczonych nurkowań</translation> </message> @@ -931,13 +946,13 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>Opis nurkowania</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>Miejsce</translation> </message> @@ -963,13 +978,13 @@ poza zakresem. Proszę je najpierw usunąć.</translation> </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>Temperatura powietrza</translation> </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>Temperatura wody</translation> </message> @@ -995,7 +1010,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation> </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>Opis</translation> </message> @@ -1126,13 +1141,13 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <translation>Dodaj balast</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Miejsce nurkowań</translation> </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>Opis nurkowań</translation> </message> @@ -1146,62 +1161,62 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <source>Cancel</source> <translation>Anuluj</translation> </message> - <message> - <location filename="../qt-ui/maintab.cpp" line="232"/> - <source>Air temp [%1]</source> - <translation type="unfinished"/> - </message> <message> <location filename="../qt-ui/maintab.cpp" line="233"/> - <source>Water temp [%1]</source> - <translation type="unfinished"/> + <source>Air temp [%1]</source> + <translation>Temp. powietrza [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="234"/> + <source>Water temp [%1]</source> + <translation>Temp. wody [%1]</translation> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>This trip is being edited.</source> <translation>Ta grupa nurkowań jest obecnie edytowana.</translation> </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>Kilka nurkowań jest obecnie edytowanych.</translation> </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>To nurkowanie jest obecnie edytowane.</translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>nieznana</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> @@ -1209,256 +1224,276 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>Filtr</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>Plik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>Widok</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>Pomoc</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>Import</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>Nowy logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Nowy</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>Otwórz logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Otwórz</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>Zapisz</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Zapisz</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Zapisz jako</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>Ctrl+Shift+S</translation> </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>Zamknij</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>Eksportuj UDDF</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="138"/> <source>Enable the pN2 Graph</source> - <translation type="unfinished"/> + <translation>Włącz wykres pN2</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="164"/> <source>Enable the pHe graph</source> - <translation type="unfinished"/> + <translation>Włącz wykres pHe</translation> </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>Pokazuj EAD, END, EADD</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Show NDL / TTS</source> - <translation type="unfinished"/> + <translation>Pokazuj NDL / TTS</translation> </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"/> + <translation>Przeskaluj głebokość</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="681"/> + <location filename="../qt-ui/mainwindow.ui" line="709"/> <source>Ctrl+U</source> <translation>Ctrl+U</translation> </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>Drukuj</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>Wyjdź</translation> </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>Importuj z komputera nurkowego</translation> </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>Importuj dane GPS z Subsurface Service</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>Edycja nazw komputerów nurkowych</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>Zmień numerację</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>Statystyka roczna</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Lista nurkowań</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Informacje</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Wszystkie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>Instrukcja obsługi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Mapa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>Zaplanuj nurkowanie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>Importuj z Divelogs.de</translation> </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>Ctrl+P</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="112"/> <source>Enable the pO2 Graph</source> - <translation type="unfinished"/> + <translation>Włącz wykres pO2</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="115"/> @@ -1474,252 +1509,263 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>...</translation> </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"/> + <translation>Włącz MOD</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="193"/> <source>Show the DC Reported Ceiling</source> - <translation type="unfinished"/> + <translation>Pokazuj sufit z komputera nurkowego</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="222"/> <source>Show the Calculated Ceiling</source> - <translation type="unfinished"/> + <translation>Pokazuj obliczony sufit</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="274"/> <source>Show Calculated Ceiling with 3m Increments</source> - <translation type="unfinished"/> + <translation>Pokazuj obliczony sufit z krokiem 3m</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="248"/> <source>Calculate All Tissues</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.ui" line="378"/> - <source>Show SAC Rate</source> - <translation type="unfinished"/> + <translation>Obliczenia dla wszystkich tkanek</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="404"/> - <source>Enable / Disable the Ruler</source> - <translation type="unfinished"/> + <source>Show SAC Rate</source> + <translation>Pokazuj SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="430"/> + <source>Enable / Disable the Ruler</source> + <translation>Włącz / wyłącz linijkę</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Preferences</source> <translation>Ustawienia</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Dodaj nurkowanie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Automatycznie grupuj</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>Poprzedni komputer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>W lewo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>Następny komputer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>W prawo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Wybór zdarzeń</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Wprowadź plan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>O Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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"/> + <translation>Importowanie logów nurkowych</translation> </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"/> + <translation>Importuj logi z innej aplikacji</translation> </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"/> + <translation>Pełen ekran</translation> </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"/> + <translation>Przełącz pełen ekran</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="884"/> + <location filename="../qt-ui/mainwindow.ui" line="920"/> <source>F11</source> - <translation type="unfinished"/> + <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="143"/> + <location filename="../qt-ui/mainwindow.cpp" line="173"/> <source>Open File</source> <translation>Otwórz plik</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>Zapisz zmiany lub anuluj edycję tego nurkowania przed zamknięciem pliku.</translation> </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>Zapisz zmiany lub anuluj edycję tego nurkowania przed planowaniem nowego.</translation> </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>Zapisz zmiany lub anuluj edycję tego nurkowania przed dodaniem nowego.</translation> </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>Czy chcesz zapisać zmiany dokonane w pliku %1?</translation> </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>Czy chcesz zapisać wprowadzone zmiany?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Zapisać zmiany?</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>Zmiany zostaną utracone jeśli ich nie za zapiszesz.</translation> </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>Zapisz plik jako</translation> </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>Ostrzeżenie</translation> </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>Zapisz zmiany lub anuluj to nurkowanie przez otwarciem nowego pliku.</translation> </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>Pliki UDDF (*.uddf *.UDDF)</translation> </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>Statystyka roczna</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>Pliki Subsurface XML (*.ssrf *.xml *.XML)</translation> </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"/> + <translation>Otwórz plik z logiem</translation> </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"/> + <translation>logi nurkowe (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;Pliki XML (*.xml);;Pliki UDDF/UDCF (*.uddf *.udcf);;Pliki JDiveLog (*.jlb);;Pliki Suunto (*.sde *.db);;Pliki CSV(*.csv);;Wszystkie pliki(*)</translation> </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"/> + <translation>Proszę dokończyć edycję tego nurkowania przed rozpoczęciem kolejnej. </translation> </message> </context> <context> @@ -1792,185 +1838,200 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <message> <location filename="../qt-ui/preferences.ui" line="237"/> <source>Animations</source> - <translation type="unfinished"/> + <translation>Animacje</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="243"/> <source>Speed</source> + <translation>Prędkość</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="289"/> + <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>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Metryczny</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Imperialny</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Dostosuj</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Głębokość</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>metry</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>stopy</translation> </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>litry</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>stopy sześcienne (cu ft)</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>stopnie Celsjusza</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>stopnie Fahrenheita</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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"/> + <translation>próg ostrzeżenia dla pO₂</translation> </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"/> + <translation>próg ostrzeżenia dla pN₂</translation> </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"/> + <translation>próg ostrzeżenia dla pHe</translation> </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"/> + <translation>max ppO₂ gdy wyświetlany jest MOD</translation> </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"/> + <translation>Pokazuj sufit z komputera nurkowego na czerwono</translation> </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>Domyślne ustawienia systemu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Filtr</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Ciśnienie</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Objętość</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Balast</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>Jednostki czasu</translation> </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>Mianownik szybkości zanurzania/wynurzania </translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>minuty</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>sekundy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Pokaż</translation> </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>GFLow na maksymalnej głębokości</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Różne</translation> </message> @@ -1980,32 +2041,32 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <translation>Ustawienia</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>Wymagane ponowne uruchomienie</translation> </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>Aby użyć nowego języka musisz ponownie uruchomić Subsurface.</translation> </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>Otwórz domyślny plik</translation> </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>Pliki Subsurface XML (*.ssrf *.xml *.XML)</translation> </message> @@ -2013,22 +2074,17 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>Podgląd</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>Drukuj</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>Zamknij</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Drukuj</translation> </message> @@ -2154,72 +2210,72 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>nieznana</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>Nurkownie #%1 - %2</translation> </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>Max głębokość: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Czas: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Użyty gaz:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>Max CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>Balast:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Opis:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Partner:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Skafander:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Widzialność:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Ocena:</translation> </message> @@ -2227,40 +2283,75 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>Dodaj zmianę gazu</translation> </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>Dodaj notatkę</translation> </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>Usuń znacznik</translation> </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>Ukryj podobne znaczniki</translation> </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>Odkryj wszystkie znaczniki</translation> </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>POWIETRZE</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>Usuń ten punkt</translation> </message> @@ -2270,22 +2361,22 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <translation>Zamknij</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>średnia</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>min.</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>max.</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>Przesuń mapę i wskaż lokalizację dwuklikiem</translation> </message> @@ -2293,12 +2384,12 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>Zmień numerację</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>Nowy numer początkowy</translation> </message> @@ -2306,80 +2397,96 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>Zmiana czasów nurkowań</translation> </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"/> + <translation>Przesuń czasy zdjęć o</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="99"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="102"/> <source>earlier</source> <translation>wcześniej</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>później</translation> </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"/> + <translation>Pliki graficzne (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> </context> <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>Zmiana czasów nurkowań</translation> </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>Przesuń czasy wybranych nurkowań o</translation> </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>h:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>wcześniej</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>później</translation> </message> @@ -2415,42 +2522,42 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Łączenie...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>Pobieranie zakończone</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>Błąd pobierania: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Błąd połączenia:</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>Niepoprawny identyfikator użytkownika!</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>Nie można przetworzyć odpowiedzi!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Pobieranie zakończone sukcesem!</translation> </message> @@ -2466,17 +2573,17 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>Opis</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2489,6 +2596,49 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <translation>Informacje</translation> </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> @@ -2505,12 +2655,12 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>Opis</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2544,11 +2694,16 @@ poza zakresem. Proszę je najpierw usunąć.</translation> </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>Hasło</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Wyślij</translation> </message> @@ -2566,37 +2721,37 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>Rodzaj</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Balast</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>Kliknięcie tu usunie ten balast z listy.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</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> @@ -2604,74 +2759,74 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <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>Rok > Miesiąc / grupa</translation> </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>Czas trwania całkowity</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation>średni</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation>najkrótszy</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation>najdłuższy</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Głębokość (%1) średnia</translation> </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>minimalna</translation> </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>maksymalna</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>SAC (%1) średni</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Temperatura (%1) @@ -2681,72 +2836,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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) lub (%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> @@ -2778,250 +2933,246 @@ Maximum</source> <translation>doczepiany</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>Błąd odczytu '%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>Maksymalna ilość kolumn danych przy imporcie CSV to %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>brak</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>przystanek deco</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>pozostały czas denny</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>wynurzanie</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>sufit</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>wysiłek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>nadajnik</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>naruszenie</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>notatka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>powierzchnia</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>przystanek bezpieczeństwa</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>zmiana gazu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>przystanek bezpieczeństwa (opcjonalny)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>przystanek bezpieczeństwa (obowiązkowy)</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>sufit (przystanek bezpieczeństwa)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>czas nurkowania</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>poniżej podłogi deco</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Max głębokość</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>Pozostały czas oddychania</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>kierunek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Ostrzeżenie: poziom nasycenia tkanek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>czas bezdekompresyjny</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>niepoprawny znacznik</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>Nie udało się utworzyć parsera dla %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Błąd podczas przetwarzania danych</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Błąd podczas przetwarzania daty i czasu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Nurkowanie %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>Błąd podczas przetwarzania czasu nurkowania</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Błąd podczas przetwarzania głębokości</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Błąd podczas przetwarzania danych o ilości użytych rodzajów gazu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Błąd podczas przetwarzania danych o zasoleniu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Błąd podczas przetwarzania danych o cienieniu atmosferycznym</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Błąd podczas przetwarzania danych o użytym rodzaju gazu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Błąd podczas przetwarzania próbek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Oczekiwanie na działanie użytkownika</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>model=%u (0x%08x), firmware=%u (0x%08x), numer seryjny=%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>Błąd rejestracji uchwytu (event handler)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Błąd rejestracji uchwytu (cancellation handler)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Błąd podczas importowania danych</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>Nie można utworzyć kontekstu libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Nie udało się otworzyć %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>Podejrzany skład procentowy %s @@ -3029,85 +3180,79 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Nie udało się przetworzyć '%s'. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Nie udało się przetworzyć '%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>Zapytanie bazy danych get_events nie powiodło się.⏎ </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>Błąd połączenia z bazą danych '%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>Błąd komunikacji z bazą danych '%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>Nie można otworzyć arkusza stylów %s</translation> </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>Nie znaleziono gazu %d/%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>Zbyt wiele rodzajów gazu</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 @@ -3120,357 +3265,389 @@ w oparciu o GFlow = %.0f oraz 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>Przejście do %.*f %s w %d:%02d min - runtime %d:%02u z %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>Pozostań na %.*f %s przez %d:%02d min - runtime %d:%02u z %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Zmiana gazu na %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Zużycie gazu: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f%s z %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"/> + <translation>@: %d:%02d +D: %.1f%s +</translation> </message> <message> - <location filename="../profile.c" line="1234"/> + <location filename="../profile.c" line="1229"/> <source>P: %d%s </source> - <translation type="unfinished"/> + <translation>P: %d%s +</translation> </message> <message> - <location filename="../profile.c" line="1238"/> + <location filename="../profile.c" line="1233"/> <source>T: %.1f%s </source> - <translation type="unfinished"/> + <translation>T: %.1f%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1239"/> + <source>V: %.1f%s +</source> + <translation>V: %.1f%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1242"/> + <source>SAC: %2.1fl/min +</source> + <translation>SAC: %2.1fl/min +</translation> </message> <message> <location filename="../profile.c" line="1244"/> - <source>V: %.1f%s -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1247"/> - <source>SAC: %2.1fl/min -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1249"/> <source>CNS: %u%% </source> - <translation type="unfinished"/> + <translation>CNS: %u%% +</translation> </message> <message> - <location filename="../profile.c" line="1251"/> + <location filename="../profile.c" line="1246"/> <source>pO%s: %.2fbar </source> - <translation type="unfinished"/> + <translation>pO%s: %.2fbar +</translation> + </message> + <message> + <location filename="../profile.c" line="1248"/> + <source>pN%s: %.2fbar +</source> + <translation>pN%s: %.2fbar +</translation> + </message> + <message> + <location filename="../profile.c" line="1250"/> + <source>pHe: %.2fbar +</source> + <translation>pHe: %.2fbar +</translation> </message> <message> <location filename="../profile.c" line="1253"/> - <source>pN%s: %.2fbar -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1255"/> - <source>pHe: %.2fbar -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1258"/> <source>MOD: %d%s </source> - <translation type="unfinished"/> + <translation>MOD: %d%s +</translation> </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"/> - <source>Safetystop: %umin @ %.0f%s + <location filename="../profile.c" line="1264"/> + <source>END: %d%s +EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1274"/> - <source>Safetystop: unkn time @ %.0f%s + <location filename="../profile.c" line="1276"/> + <source>Safetystop: %umin @ %.0f%s </source> - <translation type="unfinished"/> + <translation>Przystanek bezp.: %umin @ %.0f%s +</translation> </message> <message> <location filename="../profile.c" line="1279"/> + <source>Safetystop: unkn time @ %.0f%s +</source> + <translation>Przystanek bezp.: nieznany czas @ %.0f%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1284"/> <source>Deco: %umin @ %.0f%s </source> - <translation type="unfinished"/> + <translation>Deco: %umin @ %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1282"/> + <location filename="../profile.c" line="1287"/> <source>Deco: unkn time @ %.0f%s </source> - <translation type="unfinished"/> + <translation>Deco: nieznany czas @ %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1286"/> + <location filename="../profile.c" line="1291"/> <source>In deco </source> - <translation type="unfinished"/> + <translation>dekompresja + +</translation> </message> <message> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1293"/> <source>NDL: %umin </source> - <translation type="unfinished"/> + <translation>NDL: %umin +</translation> </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"/> - <source>In deco (calc) -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1302"/> - <source>NDL: %umin (calc) -</source> - <translation type="unfinished"/> + <translation>Deco: %umin @ %.0f%s (obliczone) +</translation> </message> <message> <location filename="../profile.c" line="1305"/> + <source>In deco (calc) +</source> + <translation>dekompresja (obliczone) +</translation> + </message> + <message> + <location filename="../profile.c" line="1307"/> + <source>NDL: %umin (calc) +</source> + <translation>NDL: %umin (calc) +</translation> + </message> + <message> + <location filename="../profile.c" line="1310"/> <source>TTS: %umin (calc) </source> - <translation type="unfinished"/> + <translation>TTS: %umin (calc) +</translation> </message> <message> - <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1313"/> <source>Calculated ceiling %.0f%s </source> - <translation type="unfinished"/> + <translation>%.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1314"/> + <location filename="../profile.c" line="1319"/> <source>Tissue %.0fmin: %.0f%s </source> - <translation type="unfinished"/> + <translation>Tkanaka %.0fmin: %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1320"/> + <location filename="../profile.c" line="1325"/> <source>heartbeat: %d </source> - <translation type="unfinished"/> + <translation>tętno: %d +</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1327"/> <source>bearing: %d </source> - <translation type="unfinished"/> + <translation>kurs: %d +</translation> </message> <message> - <location filename="../profile.c" line="1414"/> + <location filename="../profile.c" line="1419"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </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>%s %sGł:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sGł:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 dives)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 nurkowanie)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>z łodzi</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>z brzegu</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>dryf</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>głębokie</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>kawerna</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>podlodowe</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>wrakowe</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>jaskiniowe</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>wysokość</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>basen</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>jezioro</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>rzeka</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>nocne</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>słodka</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>uczeń</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>fotografia</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>instruktor</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>deco</translation> </message> @@ -3520,97 +3697,97 @@ EADD: %d%s <translation>(brak nurkowań)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>Nie</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Pon</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Wto</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>Śro</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Czw</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Pią</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>Sob</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Sty</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Lut</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Apr</source> <translation>Kwi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>May</source> <translation>Maj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Cze</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Lip</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Sie</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Wrz</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Paź</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Lis</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Gru</translation> </message> diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts index db773ee9a..c39c3ad52 100644 --- a/translations/subsurface_pt_BR.ts +++ b/translations/subsurface_pt_BR.ts @@ -37,37 +37,42 @@ <translation>O</translation> </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>Ao clicar aqui irá eliminar este cilindro.</translation> </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>Cilindro não pode ser eliminado</translation> </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>Esta mistura está sendo usada. Apenas cilindros que não estão em uso no mergulho podem ser removidos.</translation> </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>pés cúbicos</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>Editar nome do computador de mergulho</translation> </message> @@ -95,22 +100,22 @@ o computador de mergulho selecionado?</translation> <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>Modelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>ID do dispositivo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Apelido</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>Ao clicar aqui irá remover este computador de mergulho.</translation> </message> @@ -118,28 +123,28 @@ o computador de mergulho selecionado?</translation> <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>ar</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>EAN%1</translation> </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>Troca de emergência para circuito aberto</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>início</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>fim</translation> @@ -148,12 +153,12 @@ o computador de mergulho selecionado?</translation> <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>ar</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>EAN%1</translation> </message> @@ -161,12 +166,12 @@ o computador de mergulho selecionado?</translation> <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>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation>pés cúbicos/min</translation> </message> @@ -174,112 +179,117 @@ o computador de mergulho selecionado?</translation> <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>Mostrar caixa de pesquisa</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>expandir todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>colapsar todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>colapsar outros</translation> </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>remover mergulho(s) desta viagem</translation> </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>criar nova viagem acima</translation> </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>adicionar mergulho(s) à viagem imediatamente acima</translation> </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>mesclar viagem com a viagem acima</translation> </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>mesclar viagem com a viagem abaixo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>apagar mergulho(s)</translation> </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>marcar mergulho(s) como inválido(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>salvar como</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>exportar como UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>deslocar os tempos</translation> </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>enviar mergulho(s) para divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>Gravar mergulhos como...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Salvar arquivo como</translation> </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>Arquivos UDDF (*.uddf *.UDDF)</translation> </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>mesclar mergulhos selecionados</translation> </message> @@ -469,22 +479,22 @@ o computador de mergulho selecionado?</translation> <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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30 pés</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Erro na posição</translation> </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>Uma ou mais paradas de deco serão eliminadas com estas operações. @@ -494,37 +504,42 @@ Por favor, remova-as primeiro.</translation> <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>AR</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Profundidade final</translation> </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>Duração</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Gás utilizado</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation>Descartar o planejamento?</translation> </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>Você está prestes a eliminar seu planejamento.</translation> </message> @@ -532,17 +547,17 @@ Por favor, remova-as primeiro.</translation> <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>Pontos do plano de mergulho</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>Gases disponíveis</translation> </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>adicionar ponto ao mergulho</translation> </message> @@ -550,72 +565,72 @@ Por favor, remova-as primeiro.</translation> <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>Profundidade</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>Horário</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>Pressão</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>Temperatura</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> @@ -623,67 +638,67 @@ Por favor, remova-as primeiro.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1288"/> + <location filename="../qt-ui/models.cpp" line="1305"/> <source>#</source> <translation>nº</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1291"/> + <location filename="../qt-ui/models.cpp" line="1308"/> <source>date</source> <translation>data</translation> </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>pé(s)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1300"/> + <location filename="../qt-ui/models.cpp" line="1317"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</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>roupa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>cilindro</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>local</translation> </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 máx</translation> </message> @@ -691,44 +706,44 @@ Por favor, remova-as primeiro.</translation> <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>Resposta inválida do servidor</translation> </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>Esperava rótulo XML 'DiveDateReader', recebido '%1</translation> </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>Rótulo XML 'DiveDates' esperado não foi encontrado</translation> </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>Resposta XML defeituosa. Linha %1: %2</translation> </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>nenhum mergulho selecionado</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> - <translation>falha ao criar arquivo zip para envio: %1</translation> + <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> - <translation>falha ao criar arquivo temporário: %1</translation> + <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> - <translation>erro interno: %1</translation> + <source>internal error: %s</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> @@ -736,70 +751,70 @@ Por favor, remova-as primeiro.</translation> <translation>erro interno</translation> </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>Finalizado</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>Enviando lista de mergulhos...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>Recebendo lista de mergulhos...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>Recebendo %1 mergulhos...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>Recebimento terminado - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Recebimento inválido</translation> </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>O arquivo não pode ser aberto: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>Envio falhou</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Envio bem sucedido</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>Abertura de sessão (login) falhou</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>Falha na análise da resposta</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Enviado finalizado</translation> </message> @@ -922,7 +937,7 @@ Por favor, remova-as primeiro.</translation> <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>Editar pontos de mergulho selecionados</translation> </message> @@ -931,13 +946,13 @@ Por favor, remova-as primeiro.</translation> <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>Notas do mergulho</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>Local</translation> </message> @@ -963,13 +978,13 @@ Por favor, remova-as primeiro.</translation> </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>Temp ambiente</translation> </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>Temp da água</translation> </message> @@ -995,7 +1010,7 @@ Por favor, remova-as primeiro.</translation> </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>Notas</translation> </message> @@ -1126,13 +1141,13 @@ Por favor, remova-as primeiro.</translation> <translation>Adicionar sistema de lastro</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Local da viagem</translation> </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>Notas sobre a viagem</translation> </message> @@ -1147,61 +1162,61 @@ Por favor, remova-as primeiro.</translation> <translation>Cancelar</translation> </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>Esta viagem está sendo editada.</translation> </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>Vários mergulhos estão sendo editados.</translation> </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>Este mergulho está sendo editado.</translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>desconhecido</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>L</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>W</source> <translation>O</translation> </message> @@ -1209,109 +1224,109 @@ Por favor, remova-as primeiro.</translation> <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>Filtro</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>A&rquivo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>&Ver</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>&Ajuda</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>&Importar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>&Novo logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Novo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>&Abrir logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>&Gravar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Salvar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Salvar como</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>Ctrl+Shift+S</translation> </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>Fechar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>Exportar %UDDF</translation> </message> @@ -1326,132 +1341,152 @@ Por favor, remova-as primeiro.</translation> <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>Ctrl+U</translation> </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>&Imprimir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>%Fechar</translation> </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>Importar do &computador de mergulho</translation> </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>Importar informações &GPS do serviço Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>%Editar nomes dos dispositivos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>&Renumerar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>&Estatísticas anuais</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Lista de mergulhos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Perfil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Tudo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>&Manual do usuário</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Globo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>P&lanejar mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>Importar de Divelogs.de</translation> </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>Ctrl+P</translation> </message> @@ -1474,11 +1509,12 @@ Por favor, remova-as primeiro.</translation> <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>...</translation> </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> @@ -1503,221 +1539,231 @@ Por favor, remova-as primeiro.</translation> <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>Preferências</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Adicionar mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Agrupar automaticamente</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>Computador de mergulho anterior</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Esquerda</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>Computador de mergulho seguinte</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Direita</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Selecionar eventos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Introduzir Plano</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>Sobre o Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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>Abrir arquivo</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>Por favor, salve ou cancele a edição atual do mergulho antes de fechar o arquivo.</translation> </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>Por favor salve ou cancele a edição atual do mergulho antes de iniciar um planejamento de mergulho.</translation> </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>Por favor, salve ou cancele a edição atual do mergulho atual antes de tentar adicionar um mergulho.</translation> </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>Deseja gravar as alterações feitas no arquivo %1?</translation> </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>Deseja gravar as alterações feitas no arquivo de dados?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Salvar alterações?</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>As alterações serão perdidas se não forem gravadas.</translation> </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>Salvar aquivo como</translation> </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>Aviso</translation> </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>Por favor, salve ou cancele a edição atual do mergulho antes de abrir um novo arquivo.</translation> </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>Arquivos UDDF (*.uddf *.UDDF)</translation> </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 type="unfinished"/> </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>Arquivos XML do Subsurface (*.ssrf *.xml *.XML)</translation> </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> @@ -1800,177 +1846,192 @@ Por favor, remova-as primeiro.</translation> <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>Sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Métrico</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Personalizar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>metro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>pé</translation> </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>litro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>pé cúbico</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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>Padrão do Sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Filtro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Pressão</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Peso</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>Unidades de tempo</translation> </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>Denominador da velocidade de subida/descida</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Minutos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Segundos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Mostrar</translation> </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>GFlow à profundidade máxima</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Diversos</translation> </message> @@ -1980,32 +2041,32 @@ Por favor, remova-as primeiro.</translation> <translation>Preferências</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GFlow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>Reinicialização necessária</translation> </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>Para carregar corretamente uma nova língua você deve reiniciar o Subsurface.</translation> </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>Abrir o logbook padrão</translation> </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>Arquivos XML do Subsurface (*.ssrf *.xml *.XML)</translation> </message> @@ -2013,22 +2074,17 @@ Por favor, remova-as primeiro.</translation> <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>&Prévisualizar</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>Imp&rimir</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>Fe&char</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Imprimir</translation> </message> @@ -2154,72 +2210,72 @@ Por favor, remova-as primeiro.</translation> <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>desconhecido</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>Mergulho #%1 - %2</translation> </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>Profundidade máxima: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Duração: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Gás usado:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>CNS máximo:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>Lastro:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Notas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Companheiro:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Roupa:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Visibilidade:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Classificação:</translation> </message> @@ -2227,40 +2283,75 @@ Por favor, remova-as primeiro.</translation> <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>Adicionar troca de gás</translation> </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>Adicionar favorito</translation> </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>Remover evento</translation> </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>Esconder eventos semelhantes</translation> </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>Mostrar todos os eventos</translation> </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>AR</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>Remover este ponto</translation> </message> @@ -2270,22 +2361,22 @@ Por favor, remova-as primeiro.</translation> <translation>Fechar</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Média</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Mínimo</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Máximo</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>Mova o mapa e dê um duplo clique para definir a localização do ponto de mergulho.</translation> </message> @@ -2293,12 +2384,12 @@ Por favor, remova-as primeiro.</translation> <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>Renumerar</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>Novo número inicial</translation> </message> @@ -2306,52 +2397,52 @@ Por favor, remova-as primeiro.</translation> <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>Deslocar os tempos selecionados</translation> </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>mais cedo</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>mais tarde</translation> </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> @@ -2359,27 +2450,43 @@ Por favor, remova-as primeiro.</translation> <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>Deslocar os tempos selecionados</translation> </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>Deslocar os tempos dos mergulhos selecionados em</translation> </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>h:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>mais cedo</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>mais tarde</translation> </message> @@ -2415,42 +2522,42 @@ Por favor, remova-as primeiro.</translation> <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>Serviço web</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Conectando...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>Recebimento finalizado</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>Erro no recebimento: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Erro de conexão:</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>Identificador de usuário inválido!</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>Não é possível analisar a resposta!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Operação de transferência bem sucedida!</translation> </message> @@ -2466,17 +2573,17 @@ Por favor, remova-as primeiro.</translation> <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>Descrição</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2489,6 +2596,49 @@ Por favor, remova-as primeiro.</translation> <translation>Informação</translation> </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> @@ -2505,12 +2655,12 @@ Por favor, remova-as primeiro.</translation> <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>Descrição</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2544,11 +2694,16 @@ Por favor, remova-as primeiro.</translation> </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>Senha</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Enviar</translation> </message> @@ -2566,37 +2721,37 @@ Por favor, remova-as primeiro.</translation> <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>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Peso</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>Ao clicar aqui irá remover este sistema de lastro.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</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> @@ -2604,79 +2759,79 @@ Por favor, remova-as primeiro.</translation> <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>Ano > Mês / Viagem</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1659"/> <source>#</source> <translation>nº</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1662"/> <source>Duration Total</source> <translation>Duração Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> Média</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> Mais curto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> Mais longo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Profundidade (%1) Média</translation> </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> Mínimo</translation> </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> Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Médio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2686,72 +2841,72 @@ Médio</translation> <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>pés cúbicos</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>pé(s)</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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) ou (%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> @@ -2783,250 +2938,246 @@ Médio</translation> <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>Falha na leitura de '%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>O número máximo de colunas suportadas ao importar arquivos CSV é %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>nenhum</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>parada de 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>subida</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>teto</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>nível de esforço</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>transmissor</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>violação</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>favorito</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>superfície</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>parada de segurança</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>troca de gás</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>parada de segurança (voluntária)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>parada de segurança (obrigatória)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>parada profunda</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>teto (parada de segurança)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>duração do mergulho</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>abaixo da zona de descompressão</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>prof máx</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>tempo de ar</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>direção</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Alarme do nível nos tecidos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>tempo sem parada</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>número de evento inválido</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>Não é possivel criar o analisador para %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Erro no registo dos dados</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Erro na análise da data/horário</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Mergulho 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>Erro na análise da duração do mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Erro na análise da profundidade máxima</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Erro na análise da contagem de misturas de gases</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Erro na obtenção da salinidade da água</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Erro na obtenção da pressão na superfície</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Erro na análise da mistura de gás</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Erro na análise das amostras</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Evento: aguardando ação do usuário</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>modelo=%u (0x%08x), firmware=%u (0x%08x), Nº de série=%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>Erro no registo do rótulo do evento.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Erro no registo do rótulo de cancelamento.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Erro ao importar os dados do mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>Não é possivel criar contexto da libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Não se consegue abrir %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>Percentagem estranha na leitura %s @@ -3035,85 +3186,79 @@ Médio</translation> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Falha na análise de '%s'. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Falha na análise de '%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>A consulta "get_events" falhou. </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>Conexão à base de dados falhou '%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>Consulta da base de dados falhou '%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>Falha na abertura da folha de estilo %s</translation> </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>Não é possível localizar o gás %d/%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>Misturas de gás em excesso</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 @@ -3126,357 +3271,363 @@ baseado em GFlow = %.0f e 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>Troca para %.*f %s em %d:%02d min - runtime %d:%02u em %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>Permanecer a %.*f %s durante %d:%02d min - runtime %d:%02u a %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Mudar para a mistura %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Consumo de gás: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f%s de %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>%sT: %d:%02d min</translation> </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>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 mergulhos)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 mergulho)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>barco</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>costa</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>correnteza</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>profundo</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>gruta (com luz natural)</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>gelo</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>naufrágio</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>caverna</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>altitude</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>piscina</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>lago</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>rio</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>noturno</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>água doce</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>aluno</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>foto</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>video</source> <translation>vídeo</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>instructor</source> <translation>instrutor</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>deco</translation> </message> @@ -3526,97 +3677,97 @@ EADD: %d%s <translation>(nenhum mergulho)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>Dom</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Seg</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Ter</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>Qua</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Qui</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Sex</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>Sáb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Fev</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Apr</source> <translation>Abr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Set</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Out</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Dez</translation> </message> diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts index e146219ff..d8e457629 100644 --- a/translations/subsurface_pt_PT.ts +++ b/translations/subsurface_pt_PT.ts @@ -37,37 +37,42 @@ <translation>O</translation> </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>Ao clicar aqui irá eliminar esta garrafa.</translation> </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>A garrafa não pode ser eliminada</translation> </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>A mistura está a ser usada. Apenas pode remover as garrafas não usadas durante o mergulho.</translation> </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>pés^3</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>Editar nome do computador de mergulho</translation> </message> @@ -95,22 +100,22 @@ remover o computador de mergulho seleccionado?</translation> <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>Modelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>ID do dispositivo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Alcunha</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>Ao clicar aqui irá remover este computador de mergulho.</translation> </message> @@ -118,28 +123,28 @@ remover o computador de mergulho seleccionado?</translation> <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>ar</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>EAN%1</translation> </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>Troca de emergência para circuito aberto</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>iniciar</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>fim</translation> @@ -148,12 +153,12 @@ remover o computador de mergulho seleccionado?</translation> <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>ar</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>EAN%1</translation> </message> @@ -161,12 +166,12 @@ remover o computador de mergulho seleccionado?</translation> <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>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation>pés cúbicos/min</translation> </message> @@ -174,112 +179,117 @@ remover o computador de mergulho seleccionado?</translation> <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>Mostrar caixa de busca</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>expandir todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>colapsar todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>colapsar outros</translation> </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>remover mergulho(s) desta viagem</translation> </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>criar nova viagem acima</translation> </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>adicionar mergulho(s) à viagem imediatamente acima</translation> </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>juntar viagem com a viagem acima</translation> </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>juntar viagem com a viagem abaixo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>eliminar mergulho(s)</translation> </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>marcar mergulho(s) como inválido(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>gravar como</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>exportar como UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>mudar os tempos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="735"/> + <location filename="../qt-ui/divelistview.cpp" line="765"/> <source>load images</source> <translation>carregar imagens</translation> </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>exportar mergulho(s) para divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>Gravar mergulhos como...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Gravar ficheiro como</translation> </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>Ficheiros UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="801"/> + <location filename="../qt-ui/divelistview.cpp" line="831"/> <source>Open Image Files</source> <translation>Abrir ficheiros de imagens</translation> </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>Ficheiros de imagem (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="760"/> <source>merge selected dives</source> <translation>juntar os mergulhos seleccionados</translation> </message> @@ -469,22 +479,22 @@ remover o computador de mergulho seleccionado?</translation> <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>10 m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30 pés</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Erro na posição</translation> </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>Uma ou mais patamares serão eliminados com esta operação. @@ -494,37 +504,42 @@ Por favor, remova-os primeiro</translation> <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>Ar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Profundidade final</translation> </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>Duração</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Gás usado</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation>Eliminar o plano?</translation> </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>Está prestes a eliminar o plano.</translation> </message> @@ -532,17 +547,17 @@ Por favor, remova-os primeiro</translation> <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>Pontos do plano de mergulho</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>Gases disponíveis</translation> </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>adicionar ponto ao mergulho</translation> </message> @@ -550,72 +565,72 @@ Por favor, remova-os primeiro</translation> <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>Profundidade</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>Tempo</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>Pressão</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>Temperatura da água</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>Côr</translation> </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>Inserido pelo utilizador</translation> </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>Lista de garrafas</translation> </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>Pressão S</translation> </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>Pressão I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Ceiling</source> <translation>Tecto</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>SAC</source> <translation>Consumo</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>PN2</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>PHE</source> <translation>PHE</translation> </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> @@ -623,67 +638,67 @@ Por favor, remova-os primeiro</translation> <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>data</translation> </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>pés</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1300"/> + <location filename="../qt-ui/models.cpp" line="1317"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>lbs</source> <translation>libras</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1309"/> + <location filename="../qt-ui/models.cpp" line="1326"/> <source>suit</source> <translation>fato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>garrafa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>local</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1318"/> + <location filename="../qt-ui/models.cpp" line="1335"/> <source>SAC</source> <translation>Consumo</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 máx</translation> </message> @@ -691,44 +706,44 @@ Por favor, remova-os primeiro</translation> <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>Resposta inválida do servidor</translation> </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>Esperada a tag XML 'DiveDateReader'. Em vez disso recebemos '%1</translation> </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>A tag XML esperada 'DiveDates' não foi encontrada</translation> </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>Resposta XML mal formada. Linha %1: %2</translation> </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>não foram seleccionados nenhuns mergulhos</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> - <translation>falha na criação do ficheiro zip para upload: %1</translation> + <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> - <translation>não foi possível criar o ficheiro temporário: %1</translation> + <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> - <translation>erro interno: %1</translation> + <source>internal error: %s</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> @@ -736,70 +751,70 @@ Por favor, remova-os primeiro</translation> <translation>erro interno</translation> </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>Concluído</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>A carregar a lista dos mergulhos...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>A descarregar a lista dos mergulhos...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>A descarregar %1 mergulhos</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>Descarga terminada - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Descarga corrompida</translation> </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>Não foi possível abrir o ficheiro: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>Exportação falhou</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Exportação bem sucedida</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>O login falhou</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>Não foi possível analisar a resposta</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Carregamento terminado</translation> </message> @@ -922,7 +937,7 @@ Por favor, remova-os primeiro</translation> <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>Editar locais seleccionados</translation> </message> @@ -931,13 +946,13 @@ Por favor, remova-os primeiro</translation> <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>Notas</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>Local</translation> </message> @@ -963,13 +978,13 @@ Por favor, remova-os primeiro</translation> </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>Temperatura do ar</translation> </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>Temperatura da água</translation> </message> @@ -995,7 +1010,7 @@ Por favor, remova-os primeiro</translation> </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>Notas</translation> </message> @@ -1126,13 +1141,13 @@ Por favor, remova-os primeiro</translation> <translation>Adicionar sistema de lastro</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Local da viagem</translation> </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>Notas sobre a viagem</translation> </message> @@ -1146,62 +1161,62 @@ Por favor, remova-os primeiro</translation> <source>Cancel</source> <translation>Cancelar</translation> </message> - <message> - <location filename="../qt-ui/maintab.cpp" line="232"/> - <source>Air temp [%1]</source> - <translation type="unfinished"/> - </message> <message> <location filename="../qt-ui/maintab.cpp" line="233"/> - <source>Water temp [%1]</source> - <translation type="unfinished"/> + <source>Air temp [%1]</source> + <translation>Temperatura do ar [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="234"/> + <source>Water temp [%1]</source> + <translation>Temperatura da água [%1]</translation> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>This trip is being edited.</source> <translation>Esta viagem está a ser editada.</translation> </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>Estão a ser editados vários mergulhos.</translation> </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>Este mergulho está a ser editado.</translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>desconhecido</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>O</translation> </message> @@ -1209,249 +1224,269 @@ Por favor, remova-os primeiro</translation> <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>Filtros</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>&Ficheiro</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>&Ver</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>&Ajuda</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>&Importar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>&Novo logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Novo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>&Abrir logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>&Gravar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Gravar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Guardar como...</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>Ctrl+Shift+S</translation> </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>Encerrar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>Exportar &UDDF</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="138"/> <source>Enable the pN2 Graph</source> - <translation type="unfinished"/> + <translation>Mostrar o gráfico da pN2</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="164"/> <source>Enable the pHe graph</source> + <translation>Mostrar o gráfico da pHe</translation> + </message> + <message> + <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="326"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Enable EAD, END, and EADD</source> <translation>Mostrar EAD, END e EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Show NDL / TTS</source> - <translation type="unfinished"/> + <translation>Mostrar NDL / TTS</translation> </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"/> + <translation>Alterar a escala do eixo da profundidade</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="681"/> + <location filename="../qt-ui/mainwindow.ui" line="709"/> <source>Ctrl+U</source> <translation>Ctrl+U</translation> </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>&Imprimir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>&Fechar</translation> </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>Importar do &computador de mergulho</translation> </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>Importar &GPS do serviço Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>&Editar nomes dos computadores</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>&Renumerar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>&Estatísticas anuais</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Lista de mergulhos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Perfil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Todos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>&Manual do utilizador</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Globo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>P&lanear mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>Importar a partir de Divelogs.de</translation> </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>Ctrl+P</translation> </message> @@ -1474,11 +1509,12 @@ Por favor, remova-os primeiro</translation> <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>...</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="300"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>Enable MOD</source> <translation>Mostrar MOD</translation> </message> @@ -1503,221 +1539,231 @@ Por favor, remova-os primeiro</translation> <translation>Calcular para todos os tecidos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="378"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>Show SAC Rate</source> <translation>Mostrar taxa de consumo</translation> </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>Mostrar / Esconder régua</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Preferences</source> <translation>Preferências</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Adicionar mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Agrupar automaticamente</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>Computador de mergulho anterior</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Esquerda</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>Computador de mergulho seguinte</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Direita</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Seleccionar Eventos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Introduzir Plano</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>Sobre o Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="859"/> + <location filename="../qt-ui/mainwindow.ui" line="895"/> <source>Import Log Files</source> <translation>Importar logbooks</translation> </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>Importar logbooks de outros programas</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="878"/> + <location filename="../qt-ui/mainwindow.ui" line="914"/> <source>&Full Screen</source> <translation>&Ecrã completo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="881"/> + <location filename="../qt-ui/mainwindow.ui" line="917"/> <source>Toggle Full Screen</source> <translation>Ligar ecrã completo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="884"/> + <location filename="../qt-ui/mainwindow.ui" line="920"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="143"/> + <location filename="../qt-ui/mainwindow.cpp" line="173"/> <source>Open File</source> <translation>Abrir Ficheiro</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>Por favor grave ou cancele as edições feitas a este mergulho antes de fechar o ficheiro.</translation> </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>Por favor grave ou cancele as edições a este mergulho antes de tentar planear outro.</translation> </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>Por favor grave ou cancele as edições feitas a este mergulho antes de adicionar outro mergulho.</translation> </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>Deseja gravar as alterações feitas ao ficheiro %1?</translation> </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>Deseja gravar as alterações feitas ao ficheiro de dados?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Guardar alterações?</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>As alterações serão perdidas se não forem gravadas.</translation> </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>Gravar ficheiro como</translation> </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>Aviso</translation> </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>Por favor grave ou cancele as edições feitas a este mergulho antes de abrir um novo ficheiro.</translation> </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>Ficheiros UDDF (*.uddf *.UDDF)</translation> </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>Estatísticas anuais</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>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation> </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>Abrir logbook</translation> </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>Ficheiros de logbooks (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;Ficheiros XML (*.xml);;Ficheiros UDDF/UDCF(*.uddf *.udcf);;Ficheiros JDiveLog(*.jlb);;Ficheiros Suunto(*.sde *.db);;Ficheiros CSV(*.csv);;Todos os ficheiros(*)</translation> </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>Por favor, termine a edição em curso antes de iniciar outra.</translation> </message> @@ -1792,185 +1838,200 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/preferences.ui" line="237"/> <source>Animations</source> - <translation type="unfinished"/> + <translation>Animações</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="243"/> <source>Speed</source> + <translation>Velocidade</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="289"/> + <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>Sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Métrico</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Personalizar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>metro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>pés</translation> </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>litro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>pés cúbicos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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>limite quando mostrar pO2</translation> </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>limite quando mostrar pN2</translation> </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>limite quando mostrar pHe</translation> </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>ppO2 máxima quando mostrar MOD</translation> </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>desenhar o tecto reportado pelo computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="655"/> - <source>unused tanks</source> - <translation>garrafas não usadas</translation> - </message> - <message> - <location filename="../qt-ui/preferences.ui" line="723"/> + <location filename="../qt-ui/preferences.ui" line="747"/> <source>System Default</source> <translation>Linguagem do sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Filtros</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Pressão</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="465"/> + <location filename="../qt-ui/preferences.ui" line="492"/> <source>lbs</source> <translation>libra</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="507"/> <source>Time units</source> <translation>Unidades de tempo</translation> </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>Denominador da velocidade de subida/descida</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Minutos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Segundos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Mostrar</translation> </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>GFlow à profundidade máxima</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Diversos</translation> </message> @@ -1980,32 +2041,32 @@ Por favor, remova-os primeiro</translation> <translation>Preferências</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GFlow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>É necessário reiniciar a aplicação</translation> </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>Para alterar a linguagem é necessário reiniciar o Subsurface.</translation> </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>Abrir o logbook padrão</translation> </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>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation> </message> @@ -2013,22 +2074,17 @@ Por favor, remova-os primeiro</translation> <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>%Previsão</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>Im&primir</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>&Fechar</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Imprimir</translation> </message> @@ -2154,72 +2210,72 @@ Por favor, remova-os primeiro</translation> <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>desconhecido</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>Mergulho #%1 - %2</translation> </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>Prof. Máxima: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Duração: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Gás usado:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>Consumo:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>CNS máximo:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>Lastro:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Notas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Guia:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Companheiros:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Fato:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Visibilidade:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Classificação:</translation> </message> @@ -2227,40 +2283,75 @@ Por favor, remova-os primeiro</translation> <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>Adicionar troca de gás</translation> </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>Adicionar marcador</translation> </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>Remover evento</translation> </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>Esconder eventos semelhantes</translation> </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>Mostrar todos os eventos</translation> </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>Ar</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>Remover este ponto</translation> </message> @@ -2270,22 +2361,22 @@ Por favor, remova-os primeiro</translation> <translation>Encerrar</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Média</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Mínima</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Máxima</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>Mova o mapa e dê um duplo clique para definir o local de mergulho</translation> </message> @@ -2293,12 +2384,12 @@ Por favor, remova-os primeiro</translation> <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>Renumerar</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>Novo número inicial</translation> </message> @@ -2306,52 +2397,52 @@ Por favor, remova-os primeiro</translation> <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>Deslocar os tempos seleccionados</translation> </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>Alterar horas da(s) imagem(ns) em</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="99"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="102"/> <source>earlier</source> <translation>mais cedo</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>mais tarde</translation> </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>Para calcular a diferença entre os relógios do seu computador de mergulho e a sua câmara, use a câmara para tirar uma fotografia do seu computador de mergulho onde se veja a hora actual. Descarregue a imagem para o seu PC e prima este botão.</translation> </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>Determinar a diferença de tempo da câmara</translation> </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>Seleccionar imagem do computador de mergulho em que se vejam as horas</translation> </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>Que data e hora estão representados na imagem?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="181"/> + <location filename="../qt-ui/simplewidgets.cpp" line="203"/> <source>Open Image File</source> <translation>Abrir imagem</translation> </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>Ficheiros de imagem (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -2359,27 +2450,43 @@ Por favor, remova-os primeiro</translation> <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>Deslocar os tempos seleccionados</translation> </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>Deslocar os tempos dos mergulhos seleccionados em</translation> </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>h:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>mais cedo</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>mais tarde</translation> </message> @@ -2415,42 +2522,42 @@ Por favor, remova-os primeiro</translation> <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>Serviço web</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Ligar ...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>Descarga terminada</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>Erro na descarga: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Erro de ligação:</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>Identificação de utilizador inválida !</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>Não é possível analisar a resposta !</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Operação de transferência bem sucedida!</translation> </message> @@ -2466,17 +2573,17 @@ Por favor, remova-os primeiro</translation> <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>Descrição</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2489,6 +2596,49 @@ Por favor, remova-os primeiro</translation> <translation>Informação</translation> </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> @@ -2505,12 +2655,12 @@ Por favor, remova-os primeiro</translation> <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>Descrição</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2544,11 +2694,16 @@ Por favor, remova-os primeiro</translation> </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>Palavra-passe</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Carregar</translation> </message> @@ -2566,37 +2721,37 @@ Por favor, remova-os primeiro</translation> <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>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Peso</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>Ao clicar aqui irá remover este sistema de lastro</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="442"/> + <location filename="../qt-ui/models.cpp" line="454"/> <source>lbs</source> <translation>libra</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="465"/> + <location filename="../qt-ui/models.cpp" line="478"/> <source>ft</source> <translation>pés</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> @@ -2604,79 +2759,79 @@ Por favor, remova-os primeiro</translation> <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>Ano >Mês / Viagem</translation> </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>Duração Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> Média</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> Mais curto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> Mais longo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Profundidade (%1) Média</translation> </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> Mínimo</translation> </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> Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>Consumo (%1) Médio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Temperatura (%1) @@ -2686,72 +2841,72 @@ Média</translation> <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>pés cúbicos</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>pés</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>libras</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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) ou (%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> @@ -2783,250 +2938,246 @@ Média</translation> <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>Falha na leitura de '%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>O número máximo de colunas suportadas ao importar ficheiros CSV é %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>nenhum</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>paragem de 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>subida</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>tecto</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>esforço</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>transmissor</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>transgressão</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>marcação</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>superfície</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>paragem de segurança</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>troca de gás</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>paragem de segurança (voluntária)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>paragem de segurança (obrigatória)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>paragem funda</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>tecto (paragem de segurança)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>duração do mergulho</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>abaixo da zona de descompressão</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Profundidade Máx</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>tempo de ar</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>cabeçalho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Alarme do nível nos tecidos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>tempo sem paragem</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>Número de evento inválido</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>Não é possivel criar o "parser" para %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Erro no registo de dados</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Erro na análise da data/tempo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Mergulho #%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>Erro na análise do tempo de mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Erro na análise da profundidade máxima</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Erro na análise na contagem da mistura de gás</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Erro na obtenção da salinidade da água</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Erro na obtenção da pressão atmosférica</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Erro na análise da mistura de gás</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Erro na análise das amostras</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Evento: à espera de acção do utilizador</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>modelo=%u (0x%08x), firmware=%u (0x%08x), Nº de série=%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>Erro no registo do "event handler".</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Erro no registo do "cancellation handler".</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Erro a importar os dados do mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>Não é possivel criar contexto do libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Não se consegue abrir %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>Leitura estranha das percentagens %s @@ -3035,89 +3186,83 @@ Média</translation> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Falha na análise de '%s'. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Falha na análise de '%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>A consulta "obter eventos" falhou. </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>Falha no query get_tags à base de dados. </translation> </message> <message> - <location filename="../file.c" line="176"/> + <location filename="../file.c" line="166"/> <source>Database connection failed '%s'. </source> <translation>Falha na ligação à base de dados '%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>A consulta da base de dados falhou '%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>Falha na obtenção do query get_cylinders da base de dados. </translation> </message> <message> - <location filename="../parse-xml.c" line="2004"/> + <location filename="../parse-xml.c" line="2005"/> <source>Database query get_changes failed. </source> <translation>Falha na obtenção do query get_changes na base de dados. </translation> </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>Falha na obtenção do query get_profile_sample da base de dados. </translation> </message> <message> - <location filename="../parse-xml.c" line="2102"/> + <location filename="../parse-xml.c" line="2103"/> <source>Can't open stylesheet %s</source> <translation>Não é possível abrir a folha de estilos %s</translation> </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>Não é possível encontrar o gás %d/%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>Demasiadas misturas de gás</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 @@ -3130,47 +3275,47 @@ baseado em GFlow = %.0f e 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>Transição de cota %.*f %s em %d:%02d min - runtime %d:%02u em %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>Permanecer a %.*f %s durante %d:%02d min - runtime %d:%02u a %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Alterar gás para %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Consumo de gás: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f%s de %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> @@ -3179,336 +3324,339 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1234"/> + <location filename="../profile.c" line="1229"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1238"/> + <location filename="../profile.c" line="1233"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1244"/> + <location filename="../profile.c" line="1239"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1247"/> + <location filename="../profile.c" line="1242"/> <source>SAC: %2.1fl/min </source> <translation>SAC: %2.1fl/min </translation> </message> <message> - <location filename="../profile.c" line="1249"/> + <location filename="../profile.c" line="1244"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1251"/> + <location filename="../profile.c" line="1246"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1253"/> + <location filename="../profile.c" line="1248"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1255"/> + <location filename="../profile.c" line="1250"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1253"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </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>EAD: %d%s -END: %d%s -EADD: %d%s -</translation> + <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>Paragem de segurança: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1274"/> + <location filename="../profile.c" line="1279"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Paragem de segurança: tempo desconhecido @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1279"/> + <location filename="../profile.c" line="1284"/> <source>Deco: %umin @ %.0f%s </source> <translation>Descompressão: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1282"/> + <location filename="../profile.c" line="1287"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Descompressão: tempo desconhecido @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1286"/> + <location filename="../profile.c" line="1291"/> <source>In deco </source> <translation>Em descompressão </translation> </message> <message> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1293"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1292"/> + <location filename="../profile.c" line="1297"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Descompressão: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1300"/> + <location filename="../profile.c" line="1305"/> <source>In deco (calc) </source> <translation>Em descompressão (calc) </translation> </message> <message> - <location filename="../profile.c" line="1302"/> + <location filename="../profile.c" line="1307"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1305"/> + <location filename="../profile.c" line="1310"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1313"/> <source>Calculated ceiling %.0f%s </source> <translation>Tecto calculado %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1314"/> + <location filename="../profile.c" line="1319"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tecido %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1320"/> + <location filename="../profile.c" line="1325"/> <source>heartbeat: %d </source> <translation>frequência cardíaca: %d </translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1327"/> <source>bearing: %d </source> <translation>enfiamento: %d </translation> </message> <message> - <location filename="../profile.c" line="1414"/> + <location filename="../profile.c" line="1419"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </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>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 mergulhos)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 mergulho)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>barco</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>costa</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>à deriva</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>profundo</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>caverna</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>gelo</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>naufrágio</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>gruta</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>em altitude</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>piscina</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>lago</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>rio</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>nocturno</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>água doce</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>aluno</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>foto</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>video</source> <translation>vídeo</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>instructor</source> <translation>instrutor</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>descompressão</translation> </message> @@ -3558,97 +3706,97 @@ EADD: %d%s <translation>(nenhum mergulho)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>Dom</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Seg</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Ter</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>Qua</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Qui</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Sex</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>Sáb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Fev</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Apr</source> <translation>Abr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Set</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Out</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Dez</translation> </message> diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts index afd42ccde..bc525c538 100644 --- a/translations/subsurface_ro_RO.ts +++ b/translations/subsurface_ro_RO.ts @@ -37,37 +37,42 @@ <translation>O</translation> </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>Făcând click aici veți înlătura acest tub.</translation> </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>Tubul nu poate fi înlăturat</translation> </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>Acest gaz este in uz. Doar tuburile care nu sunt folosite în timpul scufundării pot fi înlăturate.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="488"/> + <location filename="../qt-ui/models.cpp" line="502"/> <source>psi</source> <translation>livre pe inch pătrat</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>picioare cubice</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>Editează Aliasul Computerului de Scufundări</translation> </message> @@ -95,22 +100,22 @@ computerul de scufundări selectat?</translation> <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>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>ID-ul dispozitivului</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Alias</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>Făcând click aici veți înlătura acest computer de scufundări.</translation> </message> @@ -118,28 +123,28 @@ computerul de scufundări selectat?</translation> <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>aer</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>EAN%1</translation> </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 type="unfinished"/> </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>început</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>sfârșit</translation> @@ -148,12 +153,12 @@ computerul de scufundări selectat?</translation> <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>aer</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>EAN%1</translation> </message> @@ -161,12 +166,12 @@ computerul de scufundări selectat?</translation> <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>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation>picioare cubice/min</translation> </message> @@ -174,112 +179,117 @@ computerul de scufundări selectat?</translation> <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>Arată Căsuța de Căutare</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>extinde tot</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>restrânge tot</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>restrânge-le pe celelalte</translation> </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>șterge scufundarea (ările) din excursie</translation> </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>creează o nouă excursie deasupra</translation> </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>îmbină excursia cu excursia de deasupra</translation> </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>îmbină excursia cu excursia de dedesupt</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>șterge scufundarea (ările)</translation> </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>salvează ca</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>exportă ca UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>mută timpurile</translation> </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>Salvează Scufundările ca...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Salvează Fișierul ca</translation> </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>Fișiere UDDF (*.uddf *.UDDF)</translation> </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>îmbină scufundările selectate</translation> </message> @@ -469,22 +479,22 @@ computerul de scufundări selectat?</translation> <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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30 de picioare</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Eroare cauzată de Handlerul Poziției</translation> </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>Una sau mai multe din opririle dumneavoastră vor fi pierdute după această operație, @@ -494,37 +504,42 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>AER</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Adâncime Finală</translation> </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>Durată</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Gaz Folosit</translation> </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>Înlăturați Planul?</translation> </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>Sunteți pe cale de a șterge planul.</translation> </message> @@ -532,17 +547,17 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>Puncte Planificator Scufundări</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>Gaze Disponibile</translation> </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>adaugă punct de date pentru scufundare</translation> </message> @@ -550,72 +565,72 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>Adâncime</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>Timp</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>Presiune</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>Temperatură</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> @@ -623,67 +638,67 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>data</translation> </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>picioare</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1300"/> + <location filename="../qt-ui/models.cpp" line="1317"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>lbs</source> <translation>livre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1309"/> + <location filename="../qt-ui/models.cpp" line="1326"/> <source>suit</source> <translation>costum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>tub</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>locația</translation> </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>maxCNS</translation> </message> @@ -691,44 +706,44 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>Răspuns invalid de la server</translation> </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>Tag XML așteptat „DiveDateReader”, dar s-a întâmpinat „%1”</translation> </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>Tag-ul XML așteptat „DiveDates” nu a fost găsit</translation> </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>nu a fost selectată nicio scufundare</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> - <translation>crearea fișierului zip pentru upload a eșuat: %1</translation> + <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> - <translation>nu s-a putut crea fișierul temporar: %1</translation> + <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> - <translation>eroare internă: %1</translation> + <source>internal error: %s</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> @@ -736,70 +751,70 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <translation>eroare internă</translation> </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>Finalizat</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>Se uploadează lista de scufundări...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>Se descarcă lista de scufundări...</translation> </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>Descărcarea s-a terminat - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Descărcarea a fost coruptă.</translation> </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>Arhiva nu a putut fi deschisăȘ %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>Upload-ul a eșuat</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Upload-ul a avut succes</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>Logarea a eșuat</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>Nu s-a putut parsa răspunsul</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Eroare: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Upload-ul a fost finalizat</translation> </message> @@ -922,7 +937,7 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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> @@ -931,13 +946,13 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>Notițele Scufundării</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>Locație</translation> </message> @@ -963,13 +978,13 @@ Vă rugăm, înlăturați-le mai întâi.</translation> </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>Temperatura aerului</translation> </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>Temperatura apei</translation> </message> @@ -995,7 +1010,7 @@ Vă rugăm, înlăturați-le mai întâi.</translation> </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>Notițe</translation> </message> @@ -1126,13 +1141,13 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <translation>Adaugă Sistem de Greutăți</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Locația Excursiei</translation> </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>Notițele Excursiei</translation> </message> @@ -1147,61 +1162,61 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <translation>Anulează</translation> </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>Această scufundare este editată</translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>necunoscut</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>V</translation> </message> @@ -1209,109 +1224,109 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>Filtrează</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>&Fișier</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>&Log</translation> </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>&Ajutor</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>&Importați</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>&Jurnal nou</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Nou</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>&Deschide jurnal</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Deschide</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>&Salvează</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Salvează</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Salvează ca</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>Ctrl+Shift+S</translation> </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>Închide</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>Exportă &UDDF</translation> </message> @@ -1326,132 +1341,152 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>Ctrl+U</translation> </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>&Printează</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>&</translation> </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>Importă din computerul de &scufundări</translation> </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>Importă date &GPS de la Serviciul Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>&Editează Numele Dispozitivului</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctr++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>&Renumerotează</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>&Statistici Anuale</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Listă de scufundări</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Informații</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Toate</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>&Manual Utilizator</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Harta</translation> </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>Ctrl+L</translation> </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>Importă de la Divelogs.de</translation> </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>Ctrl+P</translation> </message> @@ -1474,11 +1509,12 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>...</translation> </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> @@ -1503,221 +1539,231 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>Preferințe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Adaugă Scufundare</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Grupează Automat</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>CS Anterior</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Stânga</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>Următorul CS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Dreapta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Selectează Evenimente</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Introduceți Plan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>Despre Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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>Deschide Fișier</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>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a închide fișierul.</translation> </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>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a încerca să planificați o scufundare.</translation> </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>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a încerca să adăugați o scufundare.</translation> </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>Doriți să salvați modificările făcute în fișierul %1?</translation> </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>Doriți să salvați modificările făcute în fișierul de date?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Salvați Modificările?</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>Modificările vor fi pierdute dacă nu le salvați.</translation> </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>Salvează Fișierul ca</translation> </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>Avertizare</translation> </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>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a deschide un nou fișier.</translation> </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>Fișiere UDDF (*.uddf *.UDDF)</translation> </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 type="unfinished"/> </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>Fișiere XML Subsurface (*.ssrf *.xml *.XML)</translation> </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> @@ -1800,177 +1846,192 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>Sistem</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Metric</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Personalizați</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Adâncime</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>metru</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>picioare</translation> </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>livre pe inch pătrat</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="401"/> + <location filename="../qt-ui/preferences.ui" line="428"/> <source>liter</source> <translation>litru</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>picioare cubice</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>Celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>Fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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>Filtrează</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Presiune</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Volum</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Temperatură</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Greutate</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="465"/> + <location filename="../qt-ui/preferences.ui" line="492"/> <source>lbs</source> <translation>livre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="507"/> <source>Time units</source> <translation>Unități de timp</translation> </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>Numitorul vitezei de ascensiune/coborâre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Minute</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Secunde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Arată</translation> </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>GFLow la adâncimea maximă</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Diverse</translation> </message> @@ -1980,32 +2041,32 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <translation>Preferințe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>Este necesară o repornire</translation> </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>Pentru a încărca corect o nouă limbă trebuie să restartați Subsurface.</translation> </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>Deschide Fișierul de Log Implicit</translation> </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>Fișiere XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> @@ -2013,22 +2074,17 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>&Închide</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Printează</translation> </message> @@ -2154,72 +2210,72 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>necunoscut</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>Scufundarea #%1 - %2</translation> </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>Adâncimea maximă: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Durata: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Gaz Folosit:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>CNS Max. :</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>GreutățiȘ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Notițe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Maestru scufundare:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Companion:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Costum:</translation> </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>Rating:</translation> </message> @@ -2227,40 +2283,75 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>Adaugă Schimbare Gaz</translation> </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>Adaugă Semn de Carte</translation> </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>Șterge Eveniment</translation> </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>Șterge evenimente similare</translation> </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>Arată toate evenimentele</translation> </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>AER</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>Șterge acest Punct</translation> </message> @@ -2270,22 +2361,22 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <translation>Închide</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Medie</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Minim</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Maxim</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>Mutați harta si faceți dublu click pentru a seta locația scufundării</translation> </message> @@ -2293,12 +2384,12 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>Renumerotează</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>Nou număr de început</translation> </message> @@ -2306,52 +2397,52 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>Mută timpurile selectate</translation> </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>mai devreme</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>mai târziu</translation> </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> @@ -2359,27 +2450,43 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>Mută timpurile selectate</translation> </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>o:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>mai devreme</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>mai târziu</translation> </message> @@ -2415,42 +2522,42 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>Serviciu Web</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Se conectează...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>S-a terminat descărcarea</translation> </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>Eroare de conexiune</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>Identificator de utilizator invalid!</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>Nu se poate parsa răspunsul!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Descărcarea s-a încheiat cu succes!</translation> </message> @@ -2466,17 +2573,17 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>Descriere</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2489,6 +2596,49 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <translation>Informații</translation> </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> @@ -2505,12 +2655,12 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>Descriere</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2544,11 +2694,16 @@ Vă rugăm, înlăturați-le mai întâi.</translation> </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>Parola</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Uploadează</translation> </message> @@ -2566,37 +2721,37 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>Tip</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Greutate</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>Făcând click aici veți înlătura sistemul de greutăți.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="442"/> + <location filename="../qt-ui/models.cpp" line="454"/> <source>lbs</source> <translation>livre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="465"/> + <location filename="../qt-ui/models.cpp" line="478"/> <source>ft</source> <translation>picioare</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> @@ -2604,79 +2759,79 @@ Vă rugăm, înlăturați-le mai întâi.</translation> <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>An > Luna / Excursie</translation> </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>Durată Totală</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> Medie</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> Cel mai scurt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> Cel mai lung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Adâncime (%1) Medie</translation> </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> Minim</translation> </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> Maxim</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Mediu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2686,72 +2841,72 @@ Medie</translation> <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>livre pe inch pătrat</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>picioare cubice</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>picioare</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>livre</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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) sau (%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> @@ -2783,250 +2938,246 @@ Medie</translation> <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>Nu s-a putut citi '%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>Numărul maxim de coloane suportate la importarea CSV-ului este %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>niciunul</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>oprire de decompresie</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>ascensiune</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>plafon</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>volum de muncă</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>transmițător</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>încălcare</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>semn de carte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>suprafață</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>oprire pentru siguranță</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>schimbarea gazului</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>oprire pentru siguranță (voluntară)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>oprire pentru siguranță (obligatorie)</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>plafon (oprire pentru siguranță)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>timp scufundare</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>adâncime maximă</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>timp aer rămas</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>direcție</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>avertizare nivel țesut</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>timp fără oprire</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>numărul evenimentul este invalid</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>Nu s-a putut crea parser pentru %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Eroare înregistrând datele</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Eroare parsând data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Scufundarea %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>Eroare parsând data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Eroare parsând adâncimea maximă</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Eroare parsând valoarea amestecului de gaz</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Eroare obținând salinitatea apei</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Eroare obținând presiunea la suprafață</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Eroare parsând amestecul de gaz</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Eroare parsând eșantioanele</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Eveniment: aștept acțiunea utilizatorului</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%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>Eroare la înregistrarea handlerului de evenimente.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Eroare la înregistrarea handlerului de anulare.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Eroare la importarea datelor despre scufundare</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>Nu s-a putut crea contextul libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Nu s-a putut deschide %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>Valoare procentuală neobișnuită %s @@ -3034,85 +3185,79 @@ Medie</translation> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Nu s-a putut parsa ”%s”. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Nu s-a putut parsa „%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>Query-ul get_events nu a reușit. </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>Conectarea la baza de date a eșuat „%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>Query-ul bazei de date a eșuat „%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>Nu s-a putut deschide stylesheet-ul %s</translation> </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>Nu s-a putut găsi gazul %d/%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>Prea multe amestecuri de gaz</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 @@ -3125,357 +3270,363 @@ bazat pe GFlow = %.0f si 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>Tranziția la %.*f %s în %d:%02d min - timp rulare %d:%02u pe %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>Stați la %.*f %s pentru %d:%02d min - timp rulare %d:%02u pe %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Schimbați gazul la %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Consum de gaz: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f%s de %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>%sT: %d:%02d min</translation> </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>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 scufundări)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 scufundare)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>ambarcațiune</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>țărm</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>derivă</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>adânc</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>cavernă</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>gheață</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>epavă</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>peșteră</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>altitudine</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>piscină</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>lac</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>râu</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>noapte</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>proaspăt</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>student</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>fotografie</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>video</source> <translation>videoclip</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>instructor</source> <translation>instructor</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>decompresie</translation> </message> @@ -3525,97 +3676,97 @@ EADD: %d%s <translation>(nicio scufundare)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>Duminică</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Luni</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Marți</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>Miercuri</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Joi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Vineri</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>Sâmbătă</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Mar</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>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Iun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Iul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Noi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Dec</translation> </message> diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index bcbc86172..916f2ceea 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -37,37 +37,42 @@ <translation>O</translation> </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>Удалить этот баллон.</translation> </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>Баллон не может быть удален</translation> </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>Нельзя удалять баллоны, которые используются в погружении.</translation> </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>Бар</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="512"/> + <location filename="../qt-ui/models.cpp" line="527"/> <source>l</source> <translation>л</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="513"/> + <location filename="../qt-ui/models.cpp" line="528"/> <source>cuft</source> <translation>куб. фут</translation> </message> @@ -75,9 +80,9 @@ <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>Дайвкомпьютеры</translation> + <translation>Редактировать имена дайвкомпьютеров</translation> </message> <message> <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="45"/> @@ -95,22 +100,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>Модель</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>Идентификатор</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Имя устройства</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>Удалить этот дайв-компьютер.</translation> </message> @@ -118,28 +123,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>воздух</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>EAN%1</translation> </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>Переход на Откр. Цикл</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> начало</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> конец</translation> @@ -148,12 +153,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>воздух</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>EAN%1</translation> </message> @@ -161,12 +166,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>л/мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation>куб.фут/мин</translation> </message> @@ -174,112 +179,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>Показать поле поиска</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>развернуть все</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>свернуть все</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>свернуть остальные</translation> </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>удалить погружение(-я) из поездки</translation> </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>создать новую поездку выше</translation> </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>добавить к поездке выше</translation> </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>объединить с поездкой выше</translation> </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>объединить с поездкой ниже</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>удалить погружение(-я)</translation> </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>пометить как некорректные</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>сохранить как</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>экспорт UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>сдвинуть время</translation> </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"/> + <translation>загрузить изображения</translation> </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>выгрузить на divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>Сохранить погружения как...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Сохранить как</translation> </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>UDDF файлы (*.uddf *.UDDF)</translation> </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"/> + <translation>Открыть изображения</translation> </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"/> + <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="760"/> <source>merge selected dives</source> <translation>объединить выбранные </translation> </message> @@ -289,17 +299,17 @@ <message> <location filename="../qt-ui/divelogimportdialog.ui" line="14"/> <source>Import dive log file</source> - <translation type="unfinished"/> + <translation>Импорт журнала погружений</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="36"/> <source>Import CSV Dive Log Files</source> - <translation type="unfinished"/> + <translation>Импорт CSV журналов</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="50"/> <source>CSV options</source> - <translation type="unfinished"/> + <translation>Параметры CSV</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="62"/> @@ -370,12 +380,12 @@ <message> <location filename="../qt-ui/divelogimportdialog.ui" line="278"/> <source>Manual dives</source> - <translation type="unfinished"/> + <translation>Погружения введённые вручную</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="302"/> <source>Dive #</source> - <translation type="unfinished"/> + <translation>№</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="315"/> @@ -400,17 +410,17 @@ <message> <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> <source>Gps</source> - <translation type="unfinished"/> + <translation>GPS</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="393"/> <source>Max depth</source> - <translation type="unfinished"/> + <translation>Макс. глубина</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="406"/> <source>Mean depth</source> - <translation type="unfinished"/> + <translation>Сред. глубина</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="419"/> @@ -469,22 +479,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>10м</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30фут</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Ошибка позиции обработчика</translation> </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>Одна или несколько остановок будут утеряны во время этой @@ -494,37 +504,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>воздух</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Конечная глубина</translation> </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>Длительность</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Используемый газ</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>Настройка CC</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation>Отменить план?</translation> </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>Вы собираетесь отказаться от плана.</translation> </message> @@ -532,17 +547,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>Точки погружения</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>Доступные газы</translation> </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>Добавить точку погружения</translation> </message> @@ -550,72 +565,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>Глубина</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>Время</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>Давление</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>Температура</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"/> + <translation>Цвет</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <source>User Entered</source> + <translation>Пользователь ввёл</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> - <source>User Entered</source> - <translation type="unfinished"/> + <source>Cylinder Index</source> + <translation>Номер баллона</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> - <source>Cylinder Index</source> - <translation type="unfinished"/> + <source>Pressure S</source> + <translation>Давление S</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> - <source>Pressure S</source> - <translation type="unfinished"/> + <source>Pressure I</source> + <translation>Давление I</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> - <source>Pressure I</source> - <translation type="unfinished"/> + <source>Ceiling</source> + <translation>Потолок</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> - <source>Ceiling</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <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"/> + <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>PHE</source> <translation>pHe</translation> </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> @@ -623,67 +638,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>дата</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1297"/> + <location filename="../qt-ui/models.cpp" line="1314"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1297"/> + <location filename="../qt-ui/models.cpp" line="1314"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1300"/> + <location filename="../qt-ui/models.cpp" line="1317"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1309"/> + <location filename="../qt-ui/models.cpp" line="1326"/> <source>suit</source> <translation>костюм</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>баллон</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>местоположение</translation> </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</translation> </message> @@ -691,44 +706,44 @@ 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>Неверный ответ сервера</translation> </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>XML тег 'DiveDateReader' не найден, получен '%1</translation> </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>XML тег 'DiveDates' не найден</translation> </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>Неверный XML ответ. Строка %1: %2</translation> </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>не выбраны погружения</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> - <translation>ошибка создания zip-файла для выгрузки: %1</translation> + <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> - <translation>ошибка создания временного файла: %1</translation> + <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> - <translation>внутренняя ошибка: %1</translation> + <source>internal error: %s</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> @@ -736,70 +751,70 @@ Please, remove them first.</source> <translation>внутренняя ошибка</translation> </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>Готово</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>Выгрузка списка погружений...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>Загрузка списка погружений...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>Загрузка %1 погружений...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>Загрузка завершена - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Поврежденная загрузка</translation> </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>Невозможно открыть архив: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>Выгрузка не удалась</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Выгрузка завершена</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>Ошибка входа</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>Ошибка разбора ответа</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Ошибка: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Выгрузка завершена</translation> </message> @@ -826,7 +841,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/> <source>Find Uemis dive computer</source> - <translation type="unfinished"/> + <translation>Найти дайвкомпьютер Uemis</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/> @@ -922,7 +937,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>Изменить место погружений</translation> </message> @@ -931,13 +946,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>Погружение</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>Местонахождение</translation> </message> @@ -963,13 +978,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>Темп. воздуха</translation> </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>Темп. воды</translation> </message> @@ -995,7 +1010,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>Примечания</translation> </message> @@ -1126,13 +1141,13 @@ Please, remove them first.</source> <translation>Добавить груз</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Местонахождение поездки</translation> </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>Заметки к поездке</translation> </message> @@ -1146,62 +1161,62 @@ Please, remove them first.</source> <source>Cancel</source> <translation>Отмена</translation> </message> - <message> - <location filename="../qt-ui/maintab.cpp" line="232"/> - <source>Air temp [%1]</source> - <translation type="unfinished"/> - </message> <message> <location filename="../qt-ui/maintab.cpp" line="233"/> - <source>Water temp [%1]</source> - <translation type="unfinished"/> + <source>Air temp [%1]</source> + <translation>Темп. возд. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="234"/> + <source>Water temp [%1]</source> + <translation>Темп. воды [%1]</translation> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>This trip is being edited.</source> <translation>Редактирование поездки.</translation> </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>Множественное редактирование.</translation> </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>Редактирование погружения.</translation> </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>/мин</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1006"/> + <location filename="../qt-ui/maintab.cpp" line="1054"/> <source>N</source> <translation>С</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1006"/> + <location filename="../qt-ui/maintab.cpp" line="1054"/> <source>S</source> <translation>Ю</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>E</source> <translation>В</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>W</source> <translation>З</translation> </message> @@ -1209,256 +1224,276 @@ 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>Фильтр</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>Файл</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>Журнал</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>Вид</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>Помощь</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>Импорт</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>Новый журнал</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Новый</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Сохранить как</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>Ctrl+Shift+S</translation> </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>Закрыть</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>Экспорт UDDF</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="138"/> <source>Enable the pN2 Graph</source> - <translation type="unfinished"/> + <translation>Показать график pN2</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="164"/> <source>Enable the pHe graph</source> - <translation type="unfinished"/> + <translation>Показать график pHe</translation> </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>Показать EAD, END, EADD</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Show NDL / TTS</source> - <translation type="unfinished"/> + <translation>Показать NDL / TTS</translation> </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"/> + <translation>Альтернативный масштаб</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="681"/> + <location filename="../qt-ui/mainwindow.ui" line="709"/> <source>Ctrl+U</source> <translation>Ctrl+U</translation> </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>Печать</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>Выход</translation> </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>Импорт из дайвкомпьютера</translation> </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>Импорт данных GPS из сервиса Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>Список дайвкомпьютеров</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>Статистика за год</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Список погружений</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Профиль</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Информация</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Все</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>Руководство</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Карта</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>Планировщик</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>Импорт с сайта Divelogs.de</translation> </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>Ctrl+P</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="112"/> <source>Enable the pO2 Graph</source> - <translation type="unfinished"/> + <translation>Показать график pO2</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="115"/> @@ -1474,252 +1509,263 @@ 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>...</translation> </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"/> + <translation>Показать MOD</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="193"/> <source>Show the DC Reported Ceiling</source> - <translation type="unfinished"/> + <translation>Показать потолок компьютера</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="222"/> <source>Show the Calculated Ceiling</source> - <translation type="unfinished"/> + <translation>Показать расчетный потолок</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="274"/> <source>Show Calculated Ceiling with 3m Increments</source> - <translation type="unfinished"/> + <translation>Расчетный потолок с интервалом 3м</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="248"/> <source>Calculate All Tissues</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.ui" line="378"/> - <source>Show SAC Rate</source> - <translation type="unfinished"/> + <translation>Расчет всех тканей</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="404"/> - <source>Enable / Disable the Ruler</source> - <translation type="unfinished"/> + <source>Show SAC Rate</source> + <translation>Показать SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="430"/> + <source>Enable / Disable the Ruler</source> + <translation>Показать рулетку</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Preferences</source> <translation>Предпочтения</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Добавить погружение</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Авто-группировка</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>Пред. компьютер</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Влево</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>След. компьютер</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Вправо</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Выбрать события</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Ввести план</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>О Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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"/> + <translation>Импорт файлов журналов</translation> </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"/> + <translation>Импортировать журнал погружений из другой программы</translation> </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"/> + <translation>Полноэкранный режим</translation> </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"/> + <translation>Переключить полноэкранный режим</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="884"/> + <location filename="../qt-ui/mainwindow.ui" line="920"/> <source>F11</source> - <translation type="unfinished"/> + <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="143"/> + <location filename="../qt-ui/mainwindow.cpp" line="173"/> <source>Open File</source> <translation>Открыть файл</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>Сохраните или отмените изменения перед закрытием файла.</translation> </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>Сохраните или отмените изменения перед открытием планировщика.</translation> </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>Сохраните или отмените изменения перед добавлением погружения.</translation> </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>Сохранить изменения в файле %1?</translation> </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>Сохранить изменения в файле журнала?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Сохранить изменения?</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>Изменения будут утеряны, если вы не сохраните их.</translation> </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>Сохранить как</translation> </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>Предупреждение</translation> </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>Сохраните или отмените изменения перед открытием нового файла.</translation> </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>UDDF файлы (*.uddf *.UDDF)</translation> </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>Статистика за год</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>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> </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"/> + <translation>Открыть журнал погружений</translation> </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"/> + <translation>Файлы журналов (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);; Файлы XML(*.xml);; Файлы UDDF/UDCF(*.uddf *.udcf);; Файлы JDiveLog(*.jlb);; Файлы Suunto(*.sde *.db);;Файлы CSV(*.csv);; Все файлы(*)</translation> </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"/> + <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> </context> <context> @@ -1792,185 +1838,200 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/preferences.ui" line="237"/> <source>Animations</source> - <translation type="unfinished"/> + <translation>Анимация</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="243"/> <source>Speed</source> + <translation>Скорость</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="289"/> + <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>Система мер</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Метрическая</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Имперская</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Настроить</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>метр</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>фут</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="374"/> + <location filename="../qt-ui/preferences.ui" line="401"/> <source>bar</source> <translation>Бар</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>литр</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>куб. фут</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>цельсий</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>фаренгейт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>кг</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"/> + <translation>пороговое значение pO₂</translation> </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"/> + <translation>пороговое значение pN₂</translation> </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"/> + <translation>пороговое значение pHe</translation> </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"/> + <translation>макс. ppO₂ при отображении MOD</translation> </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"/> + <translation>показывать потолок компьютера красным</translation> </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>Язык системы</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Фильтр</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Давление</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Объем</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Температура</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="465"/> + <location filename="../qt-ui/preferences.ui" line="492"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="507"/> <source>Time units</source> <translation>Единицы времени</translation> </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>Делитель скорости спуска/подъема</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Минуты</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Секунды</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Показывать</translation> </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>GFLow на макс. грубине</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Разное</translation> </message> @@ -1980,32 +2041,32 @@ Please, remove them first.</source> <translation>Предпочтения</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>Необходим перезапуск</translation> </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>Для смены языка необходимо перезапустить Subsurface.</translation> </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>Журнал по умолчанию</translation> </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>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> </message> @@ -2013,22 +2074,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>Просмотр</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>Печать</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>Закрыть</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Печать</translation> </message> @@ -2154,72 +2210,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>неизвестно</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>Погружение №%1 - %2</translation> </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>Макс. глубина: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Длительность: %1 мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Газы:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>Макс. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>Грузы:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Заметки:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Инструктор:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Напарник:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Костюм:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Видимость:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Рейтинг:</translation> </message> @@ -2227,40 +2283,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>Добавить замену смеси</translation> </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>Добавить закладку</translation> </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>Удалить событие</translation> </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>Скрыть похожие события</translation> </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>Показать все события</translation> </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>воздух</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>Удалить эту точку</translation> </message> @@ -2270,22 +2361,22 @@ Please, remove them first.</source> <translation>Закрыть</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Средняя</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Минимум</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Максимум</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>Выберите место на карте двойным щелчком мыши.</translation> </message> @@ -2293,12 +2384,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>Перенумеровать</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>Начать нумерацию с</translation> </message> @@ -2306,80 +2397,96 @@ 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>Сдвинуть время</translation> </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"/> + <translation>Сдвинуть время изображения(-ий) на</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="99"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="102"/> <source>earlier</source> <translation>раньше</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>позже</translation> </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"/> - <source>Determine camera time offset</source> - <translation type="unfinished"/> + <translation>Чтобы вычислить сдвиг времени между часами дайвкомпьютера и камеры, необходимо сфотографировать дисплей дайвкомпьютера отображающий текущее время. Скачайте эту фотографию на компьютер и нажмите эту кнопку.</translation> </message> <message> <location filename="../qt-ui/shiftimagetimes.ui" line="155"/> + <source>Determine camera time offset</source> + <translation>Вычислить сдвиг времени камеры.</translation> + </message> + <message> + <location filename="../qt-ui/shiftimagetimes.ui" line="158"/> <source>Select image of divecomputer showing time</source> - <translation type="unfinished"/> + <translation>Выбрать изображения отображающие время на дайвкомпьютере</translation> </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"/> + <translation>Какое время и дата отображены на изображении?</translation> </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"/> + <translation>Открыть изображения</translation> </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"/> + <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> </context> <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>Сдвинуть время</translation> </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>Сдвинуть время выбранных погружений на</translation> </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>h:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>раньше</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>позже</translation> </message> @@ -2409,48 +2516,48 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/about.cpp" line="12"/> <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation type="unfinished"/> + <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Мультиплатформенный журнал погружений<br><span style='font-size: 8pt'>Линус Торвальдс, Дирк Хондел, Томас Канабрава и другие, 2011-2014</span></translation> </message> </context> <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>Вебсервис</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Соединение...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>Загрузка завершена</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>Ошибка загрузки: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Ошибка соединения:</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>Неверный идентификатор пользователя!</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>Невозможно разобрать ответ!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Успешная загрузка!</translation> </message> @@ -2466,17 +2573,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>Описание</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>мл</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>bar</source> <translation>Бар</translation> </message> @@ -2489,6 +2596,49 @@ Please, remove them first.</source> <translation>Информация</translation> </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> @@ -2505,12 +2655,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>Описание</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>кг</translation> </message> @@ -2544,11 +2694,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>Пароль</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Выгрузить</translation> </message> @@ -2566,37 +2721,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>Тип</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Вес</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>Удалить эту грузовую систему.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="442"/> + <location filename="../qt-ui/models.cpp" line="454"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="465"/> + <location filename="../qt-ui/models.cpp" line="478"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="466"/> + <location filename="../qt-ui/models.cpp" line="479"/> <source>m</source> <translation>м</translation> </message> @@ -2604,79 +2759,79 @@ 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>Год > Месяц / Поездка</translation> </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>Длительность Общее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> Кратчайшее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> Самое долгое</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Глубина (%1) Среднее</translation> </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> Минимум</translation> </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> Максимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Темп. (%1) @@ -2686,72 +2841,72 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="57"/> + <location filename="../dive.c" line="58"/> <source>pascal</source> <translation>Па</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>Бар</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>л</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>куб. фут</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>м</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>фут</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>фунт</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>кг</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) или (%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> @@ -2783,250 +2938,246 @@ Maximum</source> <translation>карабины</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>Ошибка чтения '%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>Для импорта CSV максимально допустимое кол-во колонок %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>отсутствует</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>деко стоп</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>оставшееся время на дне</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>подъем</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>потолок</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>нагрузка</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>передатчик</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>нарушение</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>закладка</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>поверхность</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>остановка безопасности</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>замена смеси</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>остановка безопасности (добровольно)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>остановка безопасности (обязательно)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>глубокая остановка</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>потолок (остановка безопасности)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>время погружения</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>ниже пола</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>макс. глуб.</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>оставшееся время по воздуху</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>направление</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>насыщение тканей</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>время без остановки</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>неверный номер события</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>Невозможно создать анализатор для %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Ошибка регистрации данных</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Ошибка разбора даты/времени</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Погружение %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>Ошибка разбора времени погружения</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Ошибка разбора макс. глубины</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Ошибка разбора счетчика смесей</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Ошибка получения солености воды</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Ошибка получения давления на поверхности</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Ошибка разбора смеси</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Ошибка разбора выборки</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Событие: ожидание действия пользователя</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>модель=%u (0x%08x), прошивка=%u (0x%08x), серийный номер=%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>Ошибка регистрации обработчика событий.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Ошибка регистрации обработчика завершения.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Ошибка импорта данных погружения</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>Невозможно создать контекст libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Невозможно открыть %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>Странное значение процентов %s @@ -3034,85 +3185,83 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Ошибка разбора '%s'. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Ошибка разбора '%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>Ошибка запроса get_events в БД. </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"/> + <translation>Запрос get_tags в базу не выполнился. +</translation> </message> <message> - <location filename="../file.c" line="176"/> + <location filename="../file.c" line="166"/> <source>Database connection failed '%s'. </source> <translation>Ошибка соединения с БД '%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>Ошибка запроса к БД '%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"/> + <translation>Запрос get_cylinders в базу не выполнился. +</translation> </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"/> + <translation>Запрос get_changes в базу не выполнился. +</translation> </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"/> + <translation>Запрос get_profile_sample в базу не выполнился. +</translation> </message> <message> - <location filename="../parse-xml.c" line="2102"/> + <location filename="../parse-xml.c" line="2103"/> <source>Can't open stylesheet %s</source> <translation>Невозможно открыть файл преобразования %s</translation> </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>Не найдена смесь %d/%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>Слишком много смесей</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 @@ -3125,357 +3274,388 @@ based on GFlow = %.0f and 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>Переход на %.*f %s за %d:%02d мин - рантайм %d:%02u на смеси %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 в течение %d:%02d мин - рантайм %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>Замена смеси на %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Расход газа: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f%s %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"/> + <translation>@: %d:%02d +Г: %.1f%s +</translation> </message> <message> - <location filename="../profile.c" line="1234"/> + <location filename="../profile.c" line="1229"/> <source>P: %d%s </source> - <translation type="unfinished"/> + <translation>Д: %d%s +</translation> </message> <message> - <location filename="../profile.c" line="1238"/> + <location filename="../profile.c" line="1233"/> <source>T: %.1f%s </source> - <translation type="unfinished"/> + <translation>Т: %.1f%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1239"/> + <source>V: %.1f%s +</source> + <translation>С: %.1f%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1242"/> + <source>SAC: %2.1fl/min +</source> + <translation>SAC: %2.1fл/мин +</translation> </message> <message> <location filename="../profile.c" line="1244"/> - <source>V: %.1f%s -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1247"/> - <source>SAC: %2.1fl/min -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1249"/> <source>CNS: %u%% </source> - <translation type="unfinished"/> + <translation>CNS: %u%% +</translation> </message> <message> - <location filename="../profile.c" line="1251"/> + <location filename="../profile.c" line="1246"/> <source>pO%s: %.2fbar </source> - <translation type="unfinished"/> + <translation>pO%s: %.2fбар +</translation> + </message> + <message> + <location filename="../profile.c" line="1248"/> + <source>pN%s: %.2fbar +</source> + <translation>pN%s: %.2fбар +</translation> + </message> + <message> + <location filename="../profile.c" line="1250"/> + <source>pHe: %.2fbar +</source> + <translation>pHe: %.2fбар +</translation> </message> <message> <location filename="../profile.c" line="1253"/> - <source>pN%s: %.2fbar -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1255"/> - <source>pHe: %.2fbar -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1258"/> <source>MOD: %d%s </source> - <translation type="unfinished"/> + <translation>MOD: %d%s +</translation> </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"/> - <source>Safetystop: %umin @ %.0f%s + <location filename="../profile.c" line="1264"/> + <source>END: %d%s +EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1274"/> - <source>Safetystop: unkn time @ %.0f%s + <location filename="../profile.c" line="1276"/> + <source>Safetystop: %umin @ %.0f%s </source> - <translation type="unfinished"/> + <translation>Ост. безопасности: %uмин @ %.0f%s +</translation> </message> <message> <location filename="../profile.c" line="1279"/> + <source>Safetystop: unkn time @ %.0f%s +</source> + <translation>Ост. безопасности: неизв. время @ %.0f%s +</translation> + </message> + <message> + <location filename="../profile.c" line="1284"/> <source>Deco: %umin @ %.0f%s </source> - <translation type="unfinished"/> + <translation>Деко: %uмин @ %.0f%с +</translation> </message> <message> - <location filename="../profile.c" line="1282"/> + <location filename="../profile.c" line="1287"/> <source>Deco: unkn time @ %.0f%s </source> - <translation type="unfinished"/> + <translation>Деко: неиз. время @ %.0f%с +</translation> </message> <message> - <location filename="../profile.c" line="1286"/> + <location filename="../profile.c" line="1291"/> <source>In deco </source> - <translation type="unfinished"/> + <translation>В деко +</translation> </message> <message> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1293"/> <source>NDL: %umin </source> - <translation type="unfinished"/> + <translation>NDL: %uмин +</translation> </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"/> - <source>In deco (calc) -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1302"/> - <source>NDL: %umin (calc) -</source> - <translation type="unfinished"/> + <translation>Деко: %uмин @ %.0f%с (вычисл.) +</translation> </message> <message> <location filename="../profile.c" line="1305"/> + <source>In deco (calc) +</source> + <translation>В деко (вычисл.) +</translation> + </message> + <message> + <location filename="../profile.c" line="1307"/> + <source>NDL: %umin (calc) +</source> + <translation>NDL: %uмин (вычисл.) +</translation> + </message> + <message> + <location filename="../profile.c" line="1310"/> <source>TTS: %umin (calc) </source> - <translation type="unfinished"/> + <translation>TTS: %uмин (вычисл.) +</translation> </message> <message> - <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1313"/> <source>Calculated ceiling %.0f%s </source> - <translation type="unfinished"/> + <translation>Расчетный потолок %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1314"/> + <location filename="../profile.c" line="1319"/> <source>Tissue %.0fmin: %.0f%s </source> - <translation type="unfinished"/> + <translation>Ткань %.0fмин: %.0f%s +</translation> </message> <message> - <location filename="../profile.c" line="1320"/> + <location filename="../profile.c" line="1325"/> <source>heartbeat: %d </source> - <translation type="unfinished"/> + <translation>пульс: %d +</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1327"/> <source>bearing: %d </source> - <translation type="unfinished"/> + <translation>азимут: %d +</translation> </message> <message> - <location filename="../profile.c" line="1414"/> + <location filename="../profile.c" line="1419"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </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>%s %sГ:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sГ:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sС:%.2f%s</translation> </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>%s %sС:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sД:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 погружений)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 погружение)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>с лодки</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>с берега</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>течение</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>глубокое</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>каверна</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>подледное</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>рэк</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>пещера</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>высокогорье</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>бассейн</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>в озере</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>в реке</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>ночное</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>пресная</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>ученик</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>фото</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>video</source> <translation>видео</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>instructor</source> <translation>инструктор</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>деко стоп</translation> </message> @@ -3525,97 +3705,97 @@ EADD: %d%s <translation>(нет погружений)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>Вск</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Пнд</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Втр</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>Срд</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Чтв</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Птн</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>Суб</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Янв</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Фев</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Мар</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Apr</source> <translation>Апр</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>May</source> <translation>Май</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Июн</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Июл</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Авг</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Снт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Окт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Ноя</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Дек</translation> </message> diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts index a4676effd..849cec273 100644 --- a/translations/subsurface_sk_SK.ts +++ b/translations/subsurface_sk_SK.ts @@ -37,37 +37,42 @@ <translation>O</translation> </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>Kliknutím sem vymažeš fľašu</translation> </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>Flaša nemôže byť vymazaná</translation> </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>Táto fľaša sa používa. Len fšaše nepoužité na ponor môžu byť vymazané.</translation> </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>Zmena voliteľného mena počítača</translation> </message> @@ -95,22 +100,22 @@ vybraný počítač?</translation> <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>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>ID zariadenia</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Voliteľný názov</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>Kliknutín sem vymažeš počítač.</translation> </message> @@ -118,28 +123,28 @@ vybraný počítač?</translation> <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>vzduch</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>EAN%1</translation> </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>Záchrana na 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>začiatok</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>koniec</translation> @@ -148,12 +153,12 @@ vybraný počítač?</translation> <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>vzduch</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>EAN%1</translation> </message> @@ -161,12 +166,12 @@ vybraný počítač?</translation> <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>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation>cuft/min</translation> </message> @@ -174,112 +179,117 @@ vybraný počítač?</translation> <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>Zobraz vyhľadávací box</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>zobraz všetky</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>zblaľ všetky</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>zbaľ ostatné</translation> </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>vymaž ponor(y) z akcie</translation> </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>vytvor novú akciu vyššie</translation> </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>pridaj ponor(y) do akcie hneď nad</translation> </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>spoj akciu s akciou vyššie</translation> </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>spoj akciu s akciou nižšie</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>zmaž ponor(y)</translation> </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>označ neplatné ponor(y)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>uložiť ako</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>exportuj ako UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>posun času</translation> </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>nahraj ponor(y) na </translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>Uložiť ponory ako...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Uložiť súbor ako</translation> </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>UDDF súbory (*.uddf *.UDDF)</translation> </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>zluč vybrané ponory</translation> </message> @@ -469,22 +479,22 @@ vybraný počítač?</translation> <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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30 stôp</translation> </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>Jedna alebo viac zastávok budu touto operáciou zrušené. @@ -494,37 +504,42 @@ Vymaž ich prosím.</translation> <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>Vzduch</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Cieľová hĺbka</translation> </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ĺžka (min)</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Použitá zmes</translation> </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>Vymazať plán?</translation> </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>Chystáš sa vymazať svoj plán.</translation> </message> @@ -532,17 +547,17 @@ Vymaž ich prosím.</translation> <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>Zmesi k dispozícií</translation> </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> @@ -550,72 +565,72 @@ Vymaž ich prosím.</translation> <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>Hĺbka</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>Čas</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>Tlak</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>Teplota</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>Spotreba plynu</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> @@ -623,67 +638,67 @@ Vymaž ich prosím.</translation> <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>dátum</translation> </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>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>lbs</source> <translation>US libra</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1309"/> + <location filename="../qt-ui/models.cpp" line="1326"/> <source>suit</source> <translation>oblek</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>fl.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>lokalita</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1318"/> + <location filename="../qt-ui/models.cpp" line="1335"/> <source>SAC</source> <translation>Spotreba plynu</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>max. CNS</translation> </message> @@ -691,44 +706,44 @@ Vymaž ich prosím.</translation> <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>Neplatná odpoveď zo servera</translation> </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>Expected XML tag 'DiveDateReader', got instead '%1</translation> </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>Očakávaný XML tag 'DiveDates' nebol nájdený</translation> </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>Nekorektná XML odpoveď. Riadok %1: %2</translation> </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>neboli vybrané žiadne ponory</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> - <translation>zlyhanie pri vytváraní zip súboru pre nahratie: %1</translation> + <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> - <translation>nie je možné vytvoriť dočasný súbor</translation> + <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> - <translation>interná chyba</translation> + <source>internal error: %s</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> @@ -736,70 +751,70 @@ Vymaž ich prosím.</translation> <translation>interná chyba</translation> </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>Hotovo</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>Nahrávanie zoznamu ponorov...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>Sťahovanie zoznamu ponorov...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>Sťahovanie %1 ponorov...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>Sťahovanie ukončené</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Poškodené sťahovanie</translation> </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>Nemôžem otvoriť archív: </translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>Nahrávanie zlýhalo</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Úspešne nahrávanie</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>Prihlásenie zlýhalo</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>Neviem spracovať odpoveď</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Chyba:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Nahrávanie ukončené</translation> </message> @@ -922,7 +937,7 @@ Vymaž ich prosím.</translation> <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>Edituj označené potápašské lokality</translation> </message> @@ -931,13 +946,13 @@ Vymaž ich prosím.</translation> <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>Poznámky</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>Miesto</translation> </message> @@ -963,13 +978,13 @@ Vymaž ich prosím.</translation> </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>Teplota vzduchu</translation> </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>Teplota vody</translation> </message> @@ -995,7 +1010,7 @@ Vymaž ich prosím.</translation> </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>Poznámky</translation> </message> @@ -1126,13 +1141,13 @@ Vymaž ich prosím.</translation> <translation>Pridaj závažia</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Lokalita</translation> </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>Poznámky</translation> </message> @@ -1147,61 +1162,61 @@ Vymaž ich prosím.</translation> <translation>Zrušiť</translation> </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>Táto akcia je editovaná.</translation> </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>Viaceré ponory sú editované.</translation> </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>Tento ponor sa edituje.</translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>neznámy</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> @@ -1209,109 +1224,109 @@ Vymaž ich prosím.</translation> <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>Filter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>&Súbor</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>&Náhľad</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>&Help</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>&Import</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>&Nový logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Nový</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>&Otvoriť logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Otvor</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>&Uložiť</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Ulož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>Ctrl+S</translation> </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>Uložiť ako</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>Ctrl+Shift+S</translation> </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>Zatvoriť</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>Export &UDDF</translation> </message> @@ -1326,132 +1341,152 @@ Vymaž ich prosím.</translation> <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>Ctrl+U</translation> </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>&Tlačiť</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>&Ukončiť</translation> </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>Import z &počítača</translation> </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>Import &GPS dát zo Subsurface služby</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>&Edituj názov zariadenia</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>&Prečisluj</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>&Ročná štatistika</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Zoznam ponorov</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Všetko</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>Užívateľský &Manual</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Zemeguľa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>P&lanuj ponor</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>Import z Divelogs.de</translation> </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>Ctrl+P</translation> </message> @@ -1474,11 +1509,12 @@ Vymaž ich prosím.</translation> <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>...</translation> </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> @@ -1503,221 +1539,231 @@ Vymaž ich prosím.</translation> <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>Nastavenia</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Pridaj ponor</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Automatické zgrupovanie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>Predchádzajúci DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Šipka v ľavo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>Nasledujúci DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Šipka v pravo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Voľba udalosti</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Plánovanie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>O Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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>Otvoriť súbor</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>Ulož alebo zruš aktuálne editovanie ponoru pred zatvorením súboru.</translation> </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>Ulož alebo zruš aktuálne editovanie ponoru pred plánovanim ponoru.</translation> </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>Ulož alebo zruš aktuálne editovanie ponoru pred pridaním nového ponoru.</translation> </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>Chceš uložiť zmeny prevedené v súbore %1?</translation> </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>Chces uložiť zmeny prevedené v dátovom súbore?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Uložiť zmeny?</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>Zmeny budu stratené ak ich neuložíš.</translation> </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>Uložiť súbor ako</translation> </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>Upozornenie</translation> </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>Ulož alebo zruš aktuálne editovanie ponoru pred otvorením nového súboru.</translation> </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>UDDF súbory (*.uddf *.UDDF)</translation> </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>Ročná štatistika</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>Subsurface XML súbory (*.ssrf *.xml *.XML)</translation> </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> @@ -1800,177 +1846,192 @@ Vymaž ich prosím.</translation> <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>Systém</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Metrický</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Imperiálny</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Personalizácia</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Hĺbka</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>stopa</translation> </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>liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>cu ft</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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>Systémove prednastavenia</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Tlak</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Objem</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Teplota</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Hmotnosť</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="465"/> + <location filename="../qt-ui/preferences.ui" line="492"/> <source>lbs</source> <translation>US libra</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="507"/> <source>Time units</source> <translation>Časové jednotky</translation> </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>Minuty</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Sekundy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Zobraz</translation> </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>GFLow na max. hĺbke</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Rôzne</translation> </message> @@ -1980,32 +2041,32 @@ Vymaž ich prosím.</translation> <translation>Nastavenia</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>Potrebný reštart</translation> </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>Na korektné nahratie nového jazyka je potrebné reštartovať Subsurface.</translation> </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>Otvor predvolený Log súbor</translation> </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>Subsurface XML súbory (*.ssrf *.xml *.XML)</translation> </message> @@ -2013,22 +2074,17 @@ Vymaž ich prosím.</translation> <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>&Náhľad</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>T&lač</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>&Zatvoriť</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Tlačiť</translation> </message> @@ -2154,72 +2210,72 @@ Vymaž ich prosím.</translation> <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>neznámy</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>Ponor #%1 - %2</translation> </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>Max hĺbka: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Trvanie: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Použitá zmes:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>Závažia:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Poznámky:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Oblek:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Viď:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Hodnotenie:</translation> </message> @@ -2227,40 +2283,75 @@ Vymaž ich prosím.</translation> <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>Pridaj zmenu zmesi</translation> </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>Pridať Bookmark</translation> </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>Vymaž udalosť</translation> </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>Schovaj podobné udalosti</translation> </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>Zobraziť všetky udalosti</translation> </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>Vzduch</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>Odstrániť tento bod</translation> </message> @@ -2270,22 +2361,22 @@ Vymaž ich prosím.</translation> <translation>Zatvoriť</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Priemer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Maximum</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>Posuň mapu a dvojklikom označ miesto ponoru</translation> </message> @@ -2293,12 +2384,12 @@ Vymaž ich prosím.</translation> <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>Prečíslovanie</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>Nové začiatočné číslo</translation> </message> @@ -2306,52 +2397,52 @@ Vymaž ich prosím.</translation> <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>Posun vybraných časov</translation> </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>skôr</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>neskôr</translation> </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> @@ -2359,27 +2450,43 @@ Vymaž ich prosím.</translation> <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>Posun vybraných časov</translation> </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>Posuň čas vybraných ponorov o</translation> </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>h:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>skôr</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>neskôr</translation> </message> @@ -2415,42 +2522,42 @@ Vymaž ich prosím.</translation> <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>Webservis</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Pripájam...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>Sťahovanie ukončené</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>Chyba sťahovania</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Chyba spojenia</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>Neplatný identifikátor užívateľa!</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>Nemôžem spracovať odpoveď!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Nahrávanie úspešne ukončené!</translation> </message> @@ -2466,17 +2573,17 @@ Vymaž ich prosím.</translation> <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>Popis</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2489,6 +2596,49 @@ Vymaž ich prosím.</translation> <translation>Informácie</translation> </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> @@ -2505,12 +2655,12 @@ Vymaž ich prosím.</translation> <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>Popis</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2544,11 +2694,16 @@ Vymaž ich prosím.</translation> </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>Heslo</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Nahratie</translation> </message> @@ -2566,37 +2721,37 @@ Vymaž ich prosím.</translation> <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>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Hmotnosť</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>Kliknutim sem vymažeš záťažový systém.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="442"/> + <location filename="../qt-ui/models.cpp" line="454"/> <source>lbs</source> <translation>US libra</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> @@ -2604,76 +2759,76 @@ Vymaž ich prosím.</translation> <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>Rok > Mesiac / Akcia</translation> </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>Trvanie Celkové</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation>Priemer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation>Najkratší</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation>Najdlhší</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Hĺbka (%1) Priemer</translation> </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> Minimum</translation> </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> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Priemer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2683,72 +2838,72 @@ Maximum</translation> <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>US libra</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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) alebo (%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> @@ -2780,250 +2935,246 @@ Maximum</translation> <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>Chyba pri načítaní '%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>Maximálny počet podporovaných stĺpcov pre CSV import je %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>žiaden</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>dekompresná zastávka</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>výstup</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>strop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>záťaž</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>vysielač</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>prekročenie</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>poznámka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>povrch</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>bezpečnostná zastávka</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>zmena plynu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>bezpečnostná zastávka (dobrovoľná)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>bezpečnostná zastávka (povinná)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>hĺbková zastávka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>strop (bezpečnostná zastávka)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>čas ponoru</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>pod stropom</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>max. hĺbka</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>čas na vzduchu</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>smer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>upozornenie nasýtenia tkanív</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>non stop čas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>neplatné číslo udalosti</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>Nie je možné spracovať %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Chyba registrácie dát</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Chyba spracovania času</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Ponor #%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>Chyba spracovania času ponoru</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Chyba spracovania maximálnej hĺbky</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Chyba spracovania dýchacích zmesí</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Chyba získania slanosti vody</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Chyba pri zisťovaní tlaku na povrchu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Chyba spracovania zmesi plynu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Chyba spracovania vzoriek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Udalosť: Čakanie na vstup uživateľa</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%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>Chyba registrácia správcu udalosti.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Chyba registrácie správcu ukončenia</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Chyba importu dát</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>Problém inicializácie libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Nie je možné otvoriť %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>Zvláštne percenta v %s @@ -3031,85 +3182,79 @@ Maximum</translation> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Chyba pri spracovaní '%s'. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Chyba pri spracovaní '%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>Neúspešná požiadavka: get_events.⏎ </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>Spojenie s databázou zlýhalo '%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>Požiadavka na databázu zlyhala '%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>Neviem otvoriť šablónu </translation> </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>Neviem nájsť zmes %d/%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>Príliš veľa zmesí</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 @@ -3122,357 +3267,363 @@ zrátaný s GFlow = %.0f a 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>Prechod na %.*f %s v %d:%02d min - runtime %d:%02u na %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>Zostaň v %.*f %s na %d:%02d min - runtime %d:%02u na %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Zmena plynu na %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Spotreba plynu: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f%s z %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>%sT: %d:%02d min</translation> </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>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 ponorov)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 ponor)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>z lode</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>z brehu</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>prúdový</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>hlboký</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>dutina</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>ľad</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>vrak</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>jaskyňa</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>výškovy</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>bazén</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>jazero</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>rieka</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>nočný</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>čerstvý</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>študent</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>fotenie</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>video</source> <translation>kamera</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>instructor</source> <translation>inštruktor</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>deco</translation> </message> @@ -3522,97 +3673,97 @@ EADD: %d%s <translation>(žiadné ponory)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>Ne</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Po</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Ut</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>St</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Št</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Pi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>So</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Mar</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>Máj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Dec</translation> </message> diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts index f4caf73e3..08c237b36 100644 --- a/translations/subsurface_source.ts +++ b/translations/subsurface_source.ts @@ -39,37 +39,42 @@ <translation type="unfinished"></translation> </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"></translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="162"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"></translation> </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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="488"/> + <location filename="../qt-ui/models.cpp" line="502"/> <source>psi</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="489"/> + <location filename="../qt-ui/models.cpp" line="503"/> <source>bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="512"/> + <location filename="../qt-ui/models.cpp" line="527"/> <source>l</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="513"/> + <location filename="../qt-ui/models.cpp" line="528"/> <source>cuft</source> <translation type="unfinished"></translation> </message> @@ -77,7 +82,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 type="unfinished"></translation> </message> @@ -96,22 +101,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 type="unfinished"></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"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation type="unfinished"></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"></translation> </message> @@ -119,28 +124,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 type="unfinished"></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"></translation> </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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation> @@ -149,12 +154,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 type="unfinished"></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"></translation> </message> @@ -162,12 +167,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"></translation> </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"></translation> </message> @@ -175,112 +180,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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="749"/> <source>merge trip with trip above</source> <translation type="unfinished"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </message> @@ -470,22 +480,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"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation type="unfinished"></translation> </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"></translation> </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"></translation> @@ -494,37 +504,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 type="unfinished"></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"></translation> </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"></translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="1156"/> <source>Duration</source> <translation type="unfinished"></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"></translation> </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"></translation> </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"></translation> </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"></translation> </message> @@ -532,17 +547,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"></translation> </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"></translation> </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"></translation> </message> @@ -550,72 +565,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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>SAC</source> <translation type="unfinished"></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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>PO2</source> <translation type="unfinished"></translation> </message> @@ -623,67 +638,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 type="unfinished"></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"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1297"/> + <location filename="../qt-ui/models.cpp" line="1314"/> <source>m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1297"/> + <location filename="../qt-ui/models.cpp" line="1314"/> <source>ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1300"/> + <location filename="../qt-ui/models.cpp" line="1317"/> <source>min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>lbs</source> <translation type="unfinished"></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"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1318"/> + <location filename="../qt-ui/models.cpp" line="1335"/> <source>SAC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1321"/> + <location filename="../qt-ui/models.cpp" line="1338"/> <source>OTU</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1324"/> + <location filename="../qt-ui/models.cpp" line="1341"/> <source>maxCNS</source> <translation type="unfinished"></translation> </message> @@ -691,43 +706,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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/> - <source>internal error: %1</source> + <source>internal error: %s</source> <translation type="unfinished"></translation> </message> <message> @@ -736,69 +751,69 @@ Please, remove them first.</source> <translation type="unfinished"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </message> @@ -921,7 +936,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"></translation> </message> @@ -930,13 +945,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 type="unfinished"></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 type="unfinished"></translation> </message> @@ -962,13 +977,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"></translation> </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"></translation> </message> @@ -994,7 +1009,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 type="unfinished"></translation> </message> @@ -1125,13 +1140,13 @@ Please, remove them first.</source> <translation type="unfinished"></translation> </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"></translation> </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"></translation> </message> @@ -1146,61 +1161,61 @@ Please, remove them first.</source> <translation type="unfinished"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1006"/> + <location filename="../qt-ui/maintab.cpp" line="1054"/> <source>N</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1006"/> + <location filename="../qt-ui/maintab.cpp" line="1054"/> <source>S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>E</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>W</source> <translation type="unfinished"></translation> </message> @@ -1208,109 +1223,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 type="unfinished"></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"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation type="unfinished"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation type="unfinished"></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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation type="unfinished"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation type="unfinished"></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"></translation> </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 type="unfinished"></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"></translation> </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 type="unfinished"></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"></translation> </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"></translation> </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"></translation> </message> @@ -1325,132 +1340,152 @@ Please, remove them first.</source> <translation type="unfinished"></translation> </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"></translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="352"/> + <source>Enable EAD, END, and EADD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Show NDL / TTS</source> <translation type="unfinished"></translation> </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"></translation> </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"></translation> </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"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="717"/> + <source>Ctrl+H</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="722"/> <source>&Print</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation type="unfinished"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation type="unfinished"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation type="unfinished"></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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation type="unfinished"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Ctrl+P</source> <translation type="unfinished"></translation> </message> @@ -1473,11 +1508,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"></translation> </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"></translation> </message> @@ -1502,221 +1538,231 @@ Please, remove them first.</source> <translation type="unfinished"></translation> </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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Preferences</source> <translation type="unfinished"></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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation type="unfinished"></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"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation type="unfinished"></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"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation type="unfinished"></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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="884"/> + <location filename="../qt-ui/mainwindow.ui" line="920"/> <source>F11</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="143"/> + <location filename="../qt-ui/mainwindow.cpp" line="173"/> <source>Open File</source> <translation type="unfinished"></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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation type="unfinished"></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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="289"/> + <source>HTML files (*.html)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="438"/> <source>Yearly Statistics</source> <translation type="unfinished"></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"></translation> </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"></translation> </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"></translation> </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"></translation> </message> @@ -1799,177 +1845,192 @@ Please, remove them first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="289"/> - <source>System</source> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> - <source>Metric</source> + <location filename="../qt-ui/preferences.ui" line="276"/> + <source>Default User ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> - <source>Imperial</source> + <location filename="../qt-ui/preferences.ui" line="287"/> + <source>Save User ID locally?</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="316"/> + <source>System</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="323"/> + <source>Metric</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="333"/> + <source>Imperial</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation type="unfinished"></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"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="374"/> + <location filename="../qt-ui/preferences.ui" line="401"/> <source>bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="384"/> + <location filename="../qt-ui/preferences.ui" line="411"/> <source>psi</source> <translation type="unfinished"></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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../qt-ui/preferences.ui" line="523"/> - <source>Show units in text labels</source> - <translation type="unfinished"></translation> - </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="655"/> - <source>unused tanks</source> - <translation type="unfinished"></translation> - </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"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation type="unfinished"></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"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="465"/> + <location filename="../qt-ui/preferences.ui" line="492"/> <source>lbs</source> <translation type="unfinished"></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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation type="unfinished"></translation> </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"></translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="679"/> + <source>show average depth</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="731"/> <source>GFLow at max depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation type="unfinished"></translation> </message> @@ -1979,32 +2040,32 @@ Please, remove them first.</source> <translation type="unfinished"></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"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation type="unfinished"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </message> @@ -2012,22 +2073,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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation type="unfinished"></translation> </message> @@ -2153,72 +2209,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 type="unfinished"></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"></translation> </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"></translation> </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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation type="unfinished"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation type="unfinished"></translation> </message> @@ -2226,40 +2282,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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="733"/> <source>Unhide all events</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="746"/> + <source>Hide events</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="746"/> + <source>Hide all %1 events?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="776"/> + <source>Remove the selected event?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="777"/> + <source>%1 @ %2:%3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="832"/> + <source>Edit name of bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="833"/> + <source>Custom name:</source> + <translation type="unfinished"></translation> + </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 type="unfinished"></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"></translation> </message> @@ -2269,22 +2360,22 @@ Please, remove them first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation type="unfinished"></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"></translation> </message> @@ -2292,12 +2383,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 type="unfinished"></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 type="unfinished"></translation> </message> @@ -2305,52 +2396,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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="99"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="102"/> <source>earlier</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation type="unfinished"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </message> @@ -2358,27 +2449,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"></translation> </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"></translation> </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"></translation> + </message> + <message> + <location filename="../qt-ui/shifttimes.ui" line="79"/> + <source>Current time:</source> + <translation type="unfinished"></translation> + </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"></translation> + </message> + <message> + <location filename="../qt-ui/shifttimes.ui" line="126"/> <source>h:mm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation type="unfinished"></translation> </message> @@ -2414,42 +2521,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 type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation type="unfinished"></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"></translation> </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"></translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation type="unfinished"></translation> </message> @@ -2465,17 +2572,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"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>bar</source> <translation type="unfinished"></translation> </message> @@ -2488,6 +2595,49 @@ Please, remove them first.</source> <translation type="unfinished"></translation> </message> </context> +<context> + <name>UpdateManager</name> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="36"/> + <source>Check for updates.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="37"/> + <source><h3>Subsurface was unable to check for updates.</h3></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="42"/> + <source><br/><b>The following error occurred:</b><br/></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="43"/> + <source><br/><br/><b>Please check your internet connection.</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="52"/> + <source>You are using the latest version of subsurface.</source> + <translation type="unfinished"></translation> + </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"></translation> + </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"></translation> + </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"></translation> + </message> +</context> <context> <name>UserManual</name> <message> @@ -2504,12 +2654,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"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation type="unfinished"></translation> </message> @@ -2543,11 +2693,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"></translation> + </message> + <message> + <location filename="../qt-ui/webservices.ui" line="92"/> <source>Password</source> <translation type="unfinished"></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"></translation> </message> @@ -2565,37 +2720,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 type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation type="unfinished"></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"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="442"/> + <location filename="../qt-ui/models.cpp" line="454"/> <source>lbs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="465"/> + <location filename="../qt-ui/models.cpp" line="478"/> <source>ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="466"/> + <location filename="../qt-ui/models.cpp" line="479"/> <source>m</source> <translation type="unfinished"></translation> </message> @@ -2603,70 +2758,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"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1659"/> <source>#</source> <translation type="unfinished"></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"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation type="unfinished"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> @@ -2675,72 +2830,72 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="57"/> + <location filename="../dive.c" line="58"/> <source>pascal</source> <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation type="unfinished"></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> @@ -2772,331 +2927,322 @@ Maximum</source> <translation type="unfinished"></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 type="unfinished"></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"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation type="unfinished"></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"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="438"/> + <location filename="../libdivecomputer.c" line="440"/> <source>Error parsing the divetime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="689"/> + <location filename="../libdivecomputer.c" line="691"/> <source>Error registering the event handler.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="484"/> + <location filename="../parse-xml.c" line="462"/> <source>Strange percentage reading %s </source> <translation type="unfinished"></translation> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation type="unfinished"></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 type="unfinished"></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"></translation> </message> <message> - <location filename="../file.c" line="176"/> + <location filename="../file.c" line="166"/> <source>Database connection failed '%s'. </source> <translation type="unfinished"></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 type="unfinished"></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"></translation> </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"></translation> </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"></translation> </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"></translation> </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 type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation type="unfinished"></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 @@ -3105,350 +3251,356 @@ based on GFlow = %.0f and GFhigh = %.0f <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="783"/> + <location filename="../planner.c" line="810"/> <source>ean</source> <translation type="unfinished"></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"></translation> </message> <message> - <location filename="../profile.c" line="1234"/> + <location filename="../profile.c" line="1229"/> <source>P: %d%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1238"/> + <location filename="../profile.c" line="1233"/> <source>T: %.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1244"/> + <location filename="../profile.c" line="1239"/> <source>V: %.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1247"/> + <location filename="../profile.c" line="1242"/> <source>SAC: %2.1fl/min </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1249"/> + <location filename="../profile.c" line="1244"/> <source>CNS: %u%% </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1251"/> + <location filename="../profile.c" line="1246"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1253"/> + <location filename="../profile.c" line="1248"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1255"/> + <location filename="../profile.c" line="1250"/> <source>pHe: %.2fbar </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1253"/> <source>MOD: %d%s </source> <translation type="unfinished"></translation> </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"></translation> </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"></translation> + </message> + <message> + <location filename="../profile.c" line="1276"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1274"/> + <location filename="../profile.c" line="1279"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1279"/> + <location filename="../profile.c" line="1284"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1282"/> + <location filename="../profile.c" line="1287"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1286"/> + <location filename="../profile.c" line="1291"/> <source>In deco </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1293"/> <source>NDL: %umin </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1292"/> + <location filename="../profile.c" line="1297"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1300"/> + <location filename="../profile.c" line="1305"/> <source>In deco (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1302"/> + <location filename="../profile.c" line="1307"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1305"/> + <location filename="../profile.c" line="1310"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1313"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1314"/> + <location filename="../profile.c" line="1319"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1320"/> + <location filename="../profile.c" line="1325"/> <source>heartbeat: %d </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1327"/> <source>bearing: %d </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1414"/> + <location filename="../profile.c" line="1419"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"></translation> </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"></translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"></translation> </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"></translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation type="unfinished"></translation> </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"></translation> </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"></translation> </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"></translation> </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"></translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>video</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>instructor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation type="unfinished"></translation> </message> @@ -3498,97 +3650,97 @@ EADD: %d%s <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Apr</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>May</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation type="unfinished"></translation> </message> diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts index f15ee22cc..e824606d4 100644 --- a/translations/subsurface_sv_SE.ts +++ b/translations/subsurface_sv_SE.ts @@ -37,37 +37,42 @@ <translation>O</translation> </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>Klicka här för att ta bort denna flaska</translation> </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>Flaska kan inte tas bort</translation> </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>Denna gas används. Bara flaskor som inte används kan tas bort</translation> </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>ft³</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>Ändra dykdatorers namn</translation> </message> @@ -95,22 +100,22 @@ radera den valda dykdatorn?</translation> <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>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>Enhetsid</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>Enhetsnamn</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>Klicka här för att ta bort denna dykdator</translation> </message> @@ -118,28 +123,28 @@ radera den valda dykdatorn?</translation> <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>luft</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>EAN%1</translation> </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>Bailout till öppet system</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>start</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>slut</translation> @@ -148,12 +153,12 @@ radera den valda dykdatorn?</translation> <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>luft</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>EAN%1</translation> </message> @@ -161,12 +166,12 @@ radera den valda dykdatorn?</translation> <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> l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation> cuft/min</translation> </message> @@ -174,112 +179,117 @@ radera den valda dykdatorn?</translation> <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>Visa sökruta</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>Expandera alla</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>Sammanslå alla</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>kollapsa andra</translation> </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>ta bort dyk från resmål</translation> </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>skapa nytt resmål ovan</translation> </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>lägg till dyk(en) till resmål direkt ovan</translation> </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>sammanfoga resmål med resmål ovan</translation> </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>sammanfoga resmål med resmål nedan</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>radera dyk</translation> </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>Markera dyk som ogiltiga</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>Spara som</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>Exportera som UDDF fil</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>skifta tider</translation> </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>Ladda upp dyk till divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>Spara dyk som...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>Spara fil som</translation> </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>UDDF filer (*.uddf *.UDDF)</translation> </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>Sammanslå dyk</translation> </message> @@ -469,22 +479,22 @@ radera den valda dykdatorn?</translation> <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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>Hantera possitionsfel</translation> </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>Ett eller flera av dina stop försvinner med denna operation @@ -494,37 +504,42 @@ vänligen ta bort dessa först.</translation> <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>LUFT</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>Slutdjup</translation> </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>Varaktighet</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>Använd gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation>Kassera plan?</translation> </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>Du kommer kassera din plan</translation> </message> @@ -532,17 +547,17 @@ vänligen ta bort dessa först.</translation> <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>Dykplaneringspunkter</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>Tillgängliga gaser</translation> </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>lägg till dykdatapunkt</translation> </message> @@ -550,72 +565,72 @@ vänligen ta bort dessa först.</translation> <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>Djup</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>Tid</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>Tryck</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>Temperatur</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>PHE</translation> </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> @@ -623,67 +638,67 @@ vänligen ta bort dessa först.</translation> <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>datum</translation> </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>Min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1309"/> + <location filename="../qt-ui/models.cpp" line="1326"/> <source>suit</source> <translation>dräkt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>flaska</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>plats</translation> </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>maxCNS</translation> </message> @@ -691,44 +706,44 @@ vänligen ta bort dessa först.</translation> <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>Ogiltigt svar från server</translation> </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>Förväntade XML tag 'DiveDateReader' men fick istället '%1</translation> </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>Förväntad XML tagg 'DiveDates' gick ej att finna</translation> </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>Felformaterat XML svar. Rad %1: %2</translation> </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>inga dyk var markerade</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> - <translation>misslyckades med att skapa en zip-fil för uppladdning: %1</translation> + <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> - <translation>kunde inte skapa temporär fil: %1</translation> + <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> - <translation>internt fel: %1</translation> + <source>internal error: %s</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> @@ -736,70 +751,70 @@ vänligen ta bort dessa först.</translation> <translation>internt fel</translation> </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>Klar</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>Laddar upp dyklista...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>Laddar ner dyklista...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>Laddar ner %1 dyk...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>Nedladdning klar - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>Misslyckad nedladdning</translation> </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>Arkivet kunde inte öppnas: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>Uppladdning misslyckades</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>Nedladdning lyckades</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>Inloggning misslyckades</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>Kan inte tolka respons</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>Fel: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>Uppladdning klar</translation> </message> @@ -922,7 +937,7 @@ vänligen ta bort dessa först.</translation> <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>Ändra valda dykplatser</translation> </message> @@ -931,13 +946,13 @@ vänligen ta bort dessa först.</translation> <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>Dykanteckningar</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>Plats</translation> </message> @@ -963,13 +978,13 @@ vänligen ta bort dessa först.</translation> </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>Lufttemp</translation> </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>Vattentemperatur</translation> </message> @@ -995,7 +1010,7 @@ vänligen ta bort dessa först.</translation> </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>Anteckningar</translation> </message> @@ -1126,13 +1141,13 @@ vänligen ta bort dessa först.</translation> <translation>Lägg till Viktsystem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>Resmål</translation> </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>Resmålsanteckningar</translation> </message> @@ -1147,61 +1162,61 @@ vänligen ta bort dessa först.</translation> <translation>Avbryt</translation> </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>Detta resmål håller på och ändras.</translation> </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>Flera dyk håller på och ändras.</translation> </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>Detta dyk håller på och ändras.</translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>okänd</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> @@ -1209,109 +1224,109 @@ vänligen ta bort dessa först.</translation> <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>Filter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>&File</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>&Logg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>&Visa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>&Hjälp</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>&Import</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>&Ny Loggbok</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>Ny</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>&Öppna loggbok</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>Öppna</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>&Spara</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Spara</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Spara som</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>Ctrl+Shift+S</translation> </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>Stäng</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>Exportera &UDDF</translation> </message> @@ -1326,132 +1341,152 @@ vänligen ta bort dessa först.</translation> <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>Ctrl+U</translation> </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>&Skriv ut</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>&Avsluta</translation> </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>Ladda ner från dykdator</translation> </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>Importera &GPSdata från Subsurface webbtjänst</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>&Ändra Enhetsnamn</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>&Renumrering</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>&Årsstatistik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>Dyklista</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Alla</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>&Användarmanual</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>Glob</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>Pl&anera Dyk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>Import från Divelogs.de</translation> </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>Ctrl+P</translation> </message> @@ -1474,11 +1509,12 @@ vänligen ta bort dessa först.</translation> <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>...</translation> </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> @@ -1503,221 +1539,231 @@ vänligen ta bort dessa först.</translation> <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>Inställningar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>Nytt dyk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>Autogruppering</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>Föregående dykdator</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>Vänster</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>Nästa dykdator</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>Höger</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>Välj händelser</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>Skriv plan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>Om Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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>Öppna fil</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>Vänligen spara eller avbryt pågående ändring av dyk innan du stänger filen.</translation> </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>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker planera ett dyk.</translation> </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>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker lägga till ett dyk.</translation> </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>Vill du spara ändringarna gjorda i filen %1?</translation> </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>Vill du spara ändringarna gjorda i datafilen?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>Spara ändringar?</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>Ändringar förloras om du inte sparar dom.</translation> </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>Spara fil som</translation> </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>Varning</translation> </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>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker öppna en ny fil.</translation> </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>UDDF filer (*.uddf *.UDDF)</translation> </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>Årsstatistik</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>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> </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> @@ -1800,177 +1846,192 @@ vänligen ta bort dessa först.</translation> <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>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>Metrisk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>Personifiera</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>Djup</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>fot</translation> </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>liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>ft³</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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>Systemets standardvärde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Tryck</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>Volym</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>Vikt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="465"/> + <location filename="../qt-ui/preferences.ui" line="492"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="507"/> <source>Time units</source> <translation>Tidsenheter</translation> </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>Hastighetsnämnare.</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>Minuter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Sekunder</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Visa</translation> </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>GFLow på maxdjup</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>Blandat</translation> </message> @@ -1980,32 +2041,32 @@ vänligen ta bort dessa först.</translation> <translation>Inställningar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>Omstart krävs</translation> </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>För att ladda nytt språk fullständigt måste Subsurface startas om.</translation> </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>Välj standard loggfil</translation> </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>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> </message> @@ -2013,22 +2074,17 @@ vänligen ta bort dessa först.</translation> <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>Förhandsvisning</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>Skriv ut</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>Stäng</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Skriv ut</translation> </message> @@ -2154,72 +2210,72 @@ vänligen ta bort dessa först.</translation> <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>okänd</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>Dyk #%1 - %2</translation> </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>Maxdjup: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>Varaktighet: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>Gas använd:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>Vikter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>Anteckningar:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>Parkamrat:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>Dräkt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>Ranking:</translation> </message> @@ -2227,40 +2283,75 @@ vänligen ta bort dessa först.</translation> <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>Lägg till gasbyte</translation> </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>Lägg till bokmärke</translation> </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>Ta bort händelse</translation> </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>Göm liknande händelser</translation> </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>Visa alla händelser</translation> </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>LUFT</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>Ta bort denna punkt</translation> </message> @@ -2270,22 +2361,22 @@ vänligen ta bort dessa först.</translation> <translation>Stäng</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Genomsnitt</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Maximum</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>Flytta runt kartan och dubbelklicka för att ställa in dykplats</translation> </message> @@ -2293,12 +2384,12 @@ vänligen ta bort dessa först.</translation> <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>Uppdatera numrering</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>Nytt startnummer</translation> </message> @@ -2306,52 +2397,52 @@ vänligen ta bort dessa först.</translation> <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>Skifta valda tider</translation> </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>tidigare</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>senare</translation> </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> @@ -2359,27 +2450,43 @@ vänligen ta bort dessa först.</translation> <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>Skifta valda tider</translation> </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>Skifta tider på valda dyk med</translation> </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>h:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>tidigare</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>senare</translation> </message> @@ -2415,42 +2522,42 @@ vänligen ta bort dessa först.</translation> <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>Webbtjänst</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>Ansluter...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>Nedladdning klar</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>Nedladdningsfel: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>Kontaktfel:</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>Ogiltigt användarid!</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>Kan inte tolka respons</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>Nedladdning lyckades!</translation> </message> @@ -2466,17 +2573,17 @@ vänligen ta bort dessa först.</translation> <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>Beskrivning</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2489,6 +2596,49 @@ vänligen ta bort dessa först.</translation> <translation>Information</translation> </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> @@ -2505,12 +2655,12 @@ vänligen ta bort dessa först.</translation> <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>Beskrivning</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2544,11 +2694,16 @@ vänligen ta bort dessa först.</translation> </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>Lösenord</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>Ladda upp</translation> </message> @@ -2566,37 +2721,37 @@ vänligen ta bort dessa först.</translation> <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>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>Vikt</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>Klicka här för att ta bort detta viktsystem</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="442"/> + <location filename="../qt-ui/models.cpp" line="454"/> <source>lbs</source> <translation>pund</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> @@ -2604,76 +2759,76 @@ vänligen ta bort dessa först.</translation> <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>År > Månad / Resmål</translation> </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>Varaktighet Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation>Genomsnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation>Kortaste</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation>Längsta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>Djup (%1) Medel</translation> </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> Minimum</translation> </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> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Medel</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2683,72 +2838,72 @@ Medel</translation> <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>ft³</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>pund</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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%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> @@ -2780,250 +2935,246 @@ Medel</translation> <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>Kunde inte öppna '%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>Maximalt antalet kolumner i CSV import är %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>inget</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>dekostopp</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>uppstigning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>ceiling</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>arbetsbelastning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>sändare</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>kränkning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>bokmärke</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>ytan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>säkerhetsstopp</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>gasbyte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>säkerhetsstopp (frivilligt)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>säkerhetsstopp (obligatoriskt)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>djupstopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>ceiling (säkerhetsstopp)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>dyktid</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>under golv</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Maxdjup</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>gastid</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>riktning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>vävnadsnivå</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>non stop tid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>okänt händelsenummer</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>Kan inte skapa parser för %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>Kunde inte registrera parser-data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>Kunde inte tolka tid och datum</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>Dyk #%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>Kunde inte tolka dyktid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>Kunde inte tolka maxdjup</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>Kunde inte tolka antal gasblandningar</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>Kunde inte ladda vattnets salthalt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>Kunde inte få tag i tyck vid ytan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>Kunde inte tolka gasblandning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>Kunde inte tolka sampel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>Händelse: väntar på användaren</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%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>Kunde inte registrera event-funktion</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>Kunde inte registrera avbrytningsrutin</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>Lyckades inte importera dykdata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>Kan inte skapa libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation>Kunde inte öppna fil %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>Konstig procent läsning %s @@ -3031,85 +3182,79 @@ Medel</translation> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>Kunde inte läsa '%s'. -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>Kunde inte läsa '%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>Databasfråga get_events misslyckades. </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>Databasanslutning misslyckades '%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>Databasfråga misslyckades '%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>Kunde inte öppna formatmall %s</translation> </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>Kan inte hitta gasen %d/%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>För många gasblandningar</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 @@ -3122,357 +3267,363 @@ baserad på GFlow = %.0f och 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>Dyk till %.*f %s i %d:%02d min - totaltid %d:%02u on %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>Stanna vid %.*f %s för %d:%02d min - totaltid %d:%02u on %s </translation> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation>Byt till gas %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>Gasanvändning: </translation> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation>%.0f%s av %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>%sT: %d:%02d min</translation> </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>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 dyk)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 dyk)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>båt</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>strand</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>ström</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>djup</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>cavern</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>is</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>vrak</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>grotta</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>höjd</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>pool</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>sjö</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>älv</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>natt</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>färsk</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>student</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>foto</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>Instruktör</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>deko</translation> </message> @@ -3522,97 +3673,97 @@ EADD: %d%s <translation>(inga dyk)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>sön</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>mån</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>tis</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>ons</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>tor</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>fre</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>lör</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>mar</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>maj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>dec</translation> </message> diff --git a/translations/subsurface_tr.ts b/translations/subsurface_tr.ts index 611edcfd7..0d30fec08 100644 --- a/translations/subsurface_tr.ts +++ b/translations/subsurface_tr.ts @@ -37,37 +37,42 @@ <translation>O</translation> </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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="489"/> + <location filename="../qt-ui/models.cpp" line="503"/> <source>bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="512"/> + <location filename="../qt-ui/models.cpp" line="527"/> <source>l</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="513"/> + <location filename="../qt-ui/models.cpp" line="528"/> <source>cuft</source> <translation type="unfinished"/> </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 type="unfinished"/> </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>Model</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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> @@ -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 type="unfinished"/> </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>Dosyayı Farklı Kaydet</translation> </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>UDDF dosyaları (*.uddf *.UDDF)</translation> </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 type="unfinished"/> </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>Süre</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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/> <source>Time</source> <translation>Zaman</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>Basınç</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>Sıcaklık</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 type="unfinished"/> </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 type="unfinished"/> </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>tarih</translation> </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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1300"/> + <location filename="../qt-ui/models.cpp" line="1317"/> <source>min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>lbs</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1321"/> + <location filename="../qt-ui/models.cpp" line="1338"/> <source>OTU</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1324"/> + <location filename="../qt-ui/models.cpp" line="1341"/> <source>maxCNS</source> <translation type="unfinished"/> </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>Bitti</translation> </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>Hata: %1</translation> </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 type="unfinished"/> </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>Konum</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 type="unfinished"/> </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>İptal</translation> </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>bilinmeyen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1006"/> + <location filename="../qt-ui/maintab.cpp" line="1054"/> <source>N</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1006"/> + <location filename="../qt-ui/maintab.cpp" line="1054"/> <source>S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>E</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1007"/> + <location filename="../qt-ui/maintab.cpp" line="1055"/> <source>W</source> <translation type="unfinished"/> </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>Filtre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>&Dosya</translation> </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>&Yardım</translation> </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>Yeni</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </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>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>&Kaydet</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>Kaydet</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>Farklı kaydet</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>Ctrl+Shift+S</translation> </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>Kapat</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </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>Ctrl+U</translation> </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>&Yazdır</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>&Çıkış</translation> </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>Ctrl+G</translation> </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>Ctrl++</translation> </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>Ctrl+R</translation> </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>Ctrl+Y</translation> </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>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>Bilgi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>Tümü</translation> </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>Ctrl+L</translation> </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>Ctrl+P</translation> </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>...</translation> </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>Tercihler</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </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>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>Subsurface Hakkında</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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>Dosya Aç</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 type="unfinished"/> </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>Dosyayı Farklı Kaydet</translation> </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>UDDF dosyaları (*.uddf *.UDDF)</translation> </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 type="unfinished"/> </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>Subsurface XML dosyaları (*.ssrf *.xml *.XML)</translation> </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"/> - <source>System</source> - <translation>Sistem</translation> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> - <source>Metric</source> - <translation>Metrik</translation> + <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="306"/> - <source>Imperial</source> + <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>Sistem</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="323"/> + <source>Metric</source> + <translation>Metrik</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="333"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="384"/> + <location filename="../qt-ui/preferences.ui" line="411"/> <source>psi</source> <translation type="unfinished"/> </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>kg</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>Filtre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>Basınç</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>Sıcaklık</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="465"/> + <location filename="../qt-ui/preferences.ui" line="492"/> <source>lbs</source> <translation type="unfinished"/> </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>Dakika</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>Saniye</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>Göster</translation> </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>Tercihler</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>Subsurface XML dosyaları (*.ssrf *.xml *.XML)</translation> </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>&Önizleme</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>&Yazdır</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>&Kapat</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>Yazdır</translation> </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>bilinmeyen</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 type="unfinished"/> </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>Kapat</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>Ortalama</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>Asgari</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>Azami</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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/renumber.ui" line="31"/> + <location filename="../qt-ui/renumber.ui" line="43"/> <source>New starting number</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/> <source>Invalid user identifier!</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="446"/> <source>Cannot parse response!</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> @@ -2486,6 +2593,49 @@ Please, remove them first.</source> <translation type="unfinished"/> </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> @@ -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>kg</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>Parola</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>Tür</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation type="unfinished"/> </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>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="442"/> + <location filename="../qt-ui/models.cpp" line="454"/> <source>lbs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="465"/> + <location filename="../qt-ui/models.cpp" line="478"/> <source>ft</source> <translation type="unfinished"/> </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,73 +2756,73 @@ 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> Ortalama</translation> </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> Asgari</translation> </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> Azami</translation> </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"/> @@ -2676,72 +2831,72 @@ Azami</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="57"/> + <location filename="../dive.c" line="58"/> <source>pascal</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) veya (%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> @@ -2773,331 +2928,322 @@ Azami</translation> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="403"/> + <location filename="../libdivecomputer.c" line="405"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="438"/> + <location filename="../libdivecomputer.c" line="440"/> <source>Error parsing the divetime</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="689"/> + <location filename="../libdivecomputer.c" line="691"/> <source>Error registering the event handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="484"/> + <location filename="../parse-xml.c" line="462"/> <source>Strange percentage reading %s </source> <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1845"/> + <location filename="../parse-xml.c" line="1846"/> <source>Database query get_events failed. </source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation type="unfinished"/> </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 @@ -3106,350 +3252,356 @@ based on GFlow = %.0f and GFhigh = %.0f <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../planner.c" line="565"/> + <location filename="../planner.c" line="550"/> <source>Switch gas to %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="584"/> + <location filename="../planner.c" line="569"/> <source>%.0f%s of %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="783"/> + <location filename="../planner.c" line="810"/> <source>ean</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>video</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> @@ -3499,97 +3651,97 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>Pazar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>Pazartesi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>Salı</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>Çarşamba</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>Perşembe</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>Cuma</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>Cumartesi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>Ocak</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>Şubat</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>Mart</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Apr</source> <translation>Nisan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>May</source> <translation>Mayıs</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>Haziran</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>Temmuz</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>Ağustos</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>Eylül</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>Ekim</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>Kasım</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>Aralık</translation> </message> 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"/> - <source>System</source> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> - <source>Metric</source> + <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="306"/> - <source>Imperial</source> + <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="323"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="333"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <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> @@ -2486,6 +2593,49 @@ Please, remove them first.</source> <translation type="unfinished"/> </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> @@ -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> diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts index 9b9919069..88f84ba27 100644 --- a/translations/subsurface_zh_TW.ts +++ b/translations/subsurface_zh_TW.ts @@ -37,37 +37,42 @@ <translation>O</translation> </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>於此處按下將移除此氣瓶.</translation> </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>氣瓶無法移除</translation> </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>此為使用氣體. 只有在潛水時, 未使用的氣體才可以被移除.</translation> </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>編輯潛水電腦別名</translation> </message> @@ -95,22 +100,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>型號</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Device ID</source> <translation>裝置 ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1430"/> <source>Nickname</source> <translation>別名</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>於此處按下將會移除此潛水電腦.</translation> </message> @@ -118,28 +123,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>air</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>EAN%1</translation> </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>跳脫至 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>開始</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>結束</translation> @@ -148,12 +153,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>air</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>EAN%1</translation> </message> @@ -161,12 +166,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>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source> cuft/min</source> <translation>cuft/min</translation> </message> @@ -174,112 +179,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>顯示搜尋盒</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>expand all</source> <translation>全部展開</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="740"/> <source>collapse all</source> <translation>全部摺疊</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="712"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>collapse others</source> <translation>摺疊其它</translation> </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>自旅程中移除潛水 (多筆)</translation> </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>於上方新增旅程</translation> </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>新增潛水 (所選) 至旅程上方.</translation> </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>與上方旅程合併</translation> </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>與下方旅程合併</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="754"/> <source>delete dive(s)</source> <translation>刪除潛水 (所選)</translation> </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>標示無效的潛水 (所選)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="762"/> <source>save As</source> <translation>另存為</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="733"/> + <location filename="../qt-ui/divelistview.cpp" line="763"/> <source>export As UDDF</source> <translation>匯出成 UDDF </translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="734"/> + <location filename="../qt-ui/divelistview.cpp" line="764"/> <source>shift times</source> <translation>移動時間</translation> </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"/> + <translation>載入圖片</translation> </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>上傳潛水 (所選) 至 divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="794"/> <source>Save Dives As...</source> <translation>儲存潛水為...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Save File as</source> <translation>另存新檔</translation> </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>UDDF 檔案 (*.uddf *.UDDF)</translation> </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"/> + <translation>打開圖片文件</translation> </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"/> + <translation>圖片文件類型(*.jpg*.jpeg*.pnm*.tif*.tiff)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="760"/> <source>merge selected dives</source> <translation>合併所選擇的潛水</translation> </message> @@ -289,17 +299,17 @@ <message> <location filename="../qt-ui/divelogimportdialog.ui" line="14"/> <source>Import dive log file</source> - <translation type="unfinished"/> + <translation>載入潛水檔案</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="36"/> <source>Import CSV Dive Log Files</source> - <translation type="unfinished"/> + <translation>載入CVS格式潛水檔案</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="50"/> <source>CSV options</source> - <translation type="unfinished"/> + <translation>CSV選項</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="62"/> @@ -370,12 +380,12 @@ <message> <location filename="../qt-ui/divelogimportdialog.ui" line="278"/> <source>Manual dives</source> - <translation type="unfinished"/> + <translation>手動潛水</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="302"/> <source>Dive #</source> - <translation type="unfinished"/> + <translation>潛水號#</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="315"/> @@ -400,17 +410,17 @@ <message> <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> <source>Gps</source> - <translation type="unfinished"/> + <translation>GPS定位</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="393"/> <source>Max depth</source> - <translation type="unfinished"/> + <translation>最大深度</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="406"/> <source>Mean depth</source> - <translation type="unfinished"/> + <translation>平均深度</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="419"/> @@ -469,22 +479,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>10m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="119"/> + <location filename="../qt-ui/diveplanner.cpp" line="116"/> <source>30ft</source> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="364"/> + <location filename="../qt-ui/diveplanner.cpp" line="363"/> <source>Handler Position Error</source> <translation>程式位置錯誤</translation> </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>在這次流程, 有一或多個停留將會被跳過, @@ -494,37 +504,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>空氣</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1085"/> + <location filename="../qt-ui/diveplanner.cpp" line="1152"/> <source>Final Depth</source> <translation>最後深度</translation> </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>區間</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1089"/> + <location filename="../qt-ui/diveplanner.cpp" line="1158"/> <source>Used Gas</source> <translation>已使用的氣體</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1091"/> + <location filename="../qt-ui/diveplanner.cpp" line="1160"/> <source>CC Set Point</source> <translation>密閉式循環設定點</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1297"/> + <location filename="../qt-ui/diveplanner.cpp" line="1395"/> <source>Discard the Plan?</source> <translation>取消這次計畫?</translation> </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>您將要放棄你的計劃.</translation> </message> @@ -532,17 +547,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>潛水計畫指示</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="936"/> + <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> <translation>可用氣瓶</translation> </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>新增潛水資料點</translation> </message> @@ -550,72 +565,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>深度</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>時間</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>壓力</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>溫度</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"/> + <translation>顔色</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <source>User Entered</source> + <translation>用戶錄入</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> - <source>User Entered</source> - <translation type="unfinished"/> + <source>Cylinder Index</source> + <translation>氣缸號</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> - <source>Cylinder Index</source> - <translation type="unfinished"/> + <source>Pressure S</source> + <translation>壓力S</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> - <source>Pressure S</source> - <translation type="unfinished"/> + <source>Pressure I</source> + <translation>壓力I</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> - <source>Pressure I</source> - <translation type="unfinished"/> + <source>Ceiling</source> + <translation>上限</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> - <source>Ceiling</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>SAC</source> <translation>耗氣率</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"/> + <translation>PN2</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <source>PHE</source> + <translation>PHE</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> - <source>PHE</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>PO2</source> <translation>PO2</translation> </message> @@ -623,67 +638,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>日期</translation> </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>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1323"/> <source>kg</source> <translation>kg</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>防寒衣</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>cyl</source> <translation>氣瓶</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1327"/> + <location filename="../qt-ui/models.cpp" line="1344"/> <source>location</source> <translation>位置</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1318"/> + <location filename="../qt-ui/models.cpp" line="1335"/> <source>SAC</source> <translation>耗氣率</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</translation> </message> @@ -691,44 +706,44 @@ 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>主機回傳不正確的回應.</translation> </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>預期的 XML 標籤 'DiveDateReader', 取代了 '%1</translation> </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>無法找到預期的 XML 標籤 'DiveDates'</translation> </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>異常的 XML 回應. 第 %1 行: %2</translation> </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>未選取任何潛水</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/> - <source>failed to create zip file for upload: %1</source> - <translation>建立上傳的壓縮檔案失敗: %1</translation> + <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> - <translation>無法建立暫存檔案: %1</translation> + <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> - <translation>內部錯誤: %1</translation> + <source>internal error: %s</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/> @@ -736,70 +751,70 @@ Please, remove them first.</source> <translation>內部錯誤</translation> </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>完成</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/> <source>Uploading dive list...</source> <translation>上傳潛水列表...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="691"/> <source>Downloading dive list...</source> <translation>下載潛水列表...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="739"/> <source>Downloading %1 dives...</source> <translation>下載 %1 潛水...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/> <source>Download finished - %1</source> <translation>下載結束 - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/> <source>Corrupted download</source> <translation>中斷下載</translation> </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>此存檔無法被開啟: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="839"/> <source>Upload failed</source> <translation>上傳失敗</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/> <source>Upload successful</source> <translation>上傳成功</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/> <source>Login failed</source> <translation>登入失敗</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/> <source>Cannot parse response</source> <translation>回覆無法解析</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/> <source>Error: %1</source> <translation>錯誤: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="826"/> <source>Upload finished</source> <translation>上傳結束</translation> </message> @@ -826,7 +841,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/> <source>Find Uemis dive computer</source> - <translation type="unfinished"/> + <translation>搜索Uemis潛水設備</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/> @@ -922,7 +937,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>編輯所選擇的潛水位置</translation> </message> @@ -931,13 +946,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>潛水記錄</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>位置</translation> </message> @@ -963,13 +978,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>氣溫</translation> </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>水溫</translation> </message> @@ -995,7 +1010,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>記錄</translation> </message> @@ -1126,13 +1141,13 @@ Please, remove them first.</source> <translation>增加配重系統</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Trip Location</source> <translation>旅程位置</translation> </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>旅程記錄</translation> </message> @@ -1147,61 +1162,61 @@ Please, remove them first.</source> <translation>取消</translation> </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>此旅程已被編輯.</translation> </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>此些旅程已被編輯.</translation> </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>此潛水已被編輯.</translation> </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>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="493"/> + <location filename="../qt-ui/maintab.cpp" line="494"/> <source>unknown</source> <translation>未知</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> @@ -1209,109 +1224,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>篩選器</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&File</source> <translation>檔案</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="566"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>&Log</source> <translation>日誌</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="578"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>&View</source> <translation>檢視</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="600"/> + <location filename="../qt-ui/mainwindow.ui" line="627"/> <source>&Help</source> <translation>幫助</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="607"/> + <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>&Import</source> <translation>匯入</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="623"/> + <location filename="../qt-ui/mainwindow.ui" line="651"/> <source>&New logbook</source> <translation>建立新日誌</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="626"/> + <location filename="../qt-ui/mainwindow.ui" line="654"/> <source>New</source> <translation>建立</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="629"/> + <location filename="../qt-ui/mainwindow.ui" line="657"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="634"/> + <location filename="../qt-ui/mainwindow.ui" line="662"/> <source>&Open logbook</source> <translation>開啟日誌</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="637"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Open</source> <translation>開啟</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="640"/> + <location filename="../qt-ui/mainwindow.ui" line="668"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="645"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <source>&Save</source> <translation>儲存</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="648"/> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <source>Save</source> <translation>儲存</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="651"/> + <location filename="../qt-ui/mainwindow.ui" line="679"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </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>另存為</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>Ctrl+Shift+S</translation> </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>關閉</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="673"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="678"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Export &UDDF</source> <translation>匯出 UDDF</translation> </message> @@ -1326,139 +1341,159 @@ 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"/> + <translation>顯示NDL/TTS</translation> </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"/> + <translation>重新調節深度坐標軸</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="681"/> + <location filename="../qt-ui/mainwindow.ui" line="709"/> <source>Ctrl+U</source> <translation>Ctrl+U</translation> </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>列印</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="697"/> + <location filename="../qt-ui/mainwindow.ui" line="733"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="705"/> + <location filename="../qt-ui/mainwindow.ui" line="741"/> <source>&Quit</source> <translation>結束</translation> </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>從潛水電腦匯入</translation> </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>自 Subsurface 服務匯入 GPS 資料</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="763"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="768"/> <source>&Edit Device Names</source> <translation>編輯裝置名稱</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="740"/> + <location filename="../qt-ui/mainwindow.ui" line="776"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="745"/> + <location filename="../qt-ui/mainwindow.ui" line="781"/> <source>&Renumber</source> <translation>重新編號</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="784"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="761"/> + <location filename="../qt-ui/mainwindow.ui" line="797"/> <source>&Yearly Statistics</source> <translation>年統計</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="764"/> + <location filename="../qt-ui/mainwindow.ui" line="800"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="769"/> + <location filename="../qt-ui/mainwindow.ui" line="805"/> <source>Dive List</source> <translation>潛水列表</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="777"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> <source>Profile</source> <translation>資訊</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="785"/> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Info</source> <translation>資訊</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="793"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>All</source> <translation>全部</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="871"/> <source>User &Manual</source> <translation>使用者說明</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="879"/> <source>Globe</source> <translation>地圖位置</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="851"/> + <location filename="../qt-ui/mainwindow.ui" line="887"/> <source>P&lan Dive</source> <translation>計畫潛水</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </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>自 Divelogs.de 匯入</translation> </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>Ctrl+P</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="112"/> <source>Enable the pO2 Graph</source> - <translation type="unfinished"/> + <translation>啓用pO2圖</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="115"/> @@ -1474,252 +1509,263 @@ 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>...</translation> </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"/> + <translation>啓用MOD</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="193"/> <source>Show the DC Reported Ceiling</source> - <translation type="unfinished"/> + <translation>顯示DC上限返匯</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="222"/> <source>Show the Calculated Ceiling</source> - <translation type="unfinished"/> + <translation>顯示計算的上限</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="274"/> <source>Show Calculated Ceiling with 3m Increments</source> - <translation type="unfinished"/> + <translation>顯示計算深度以3米為增量</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="248"/> <source>Calculate All Tissues</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.ui" line="378"/> - <source>Show SAC Rate</source> - <translation type="unfinished"/> + <translation>計算所有組織</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="404"/> - <source>Enable / Disable the Ruler</source> - <translation type="unfinished"/> + <source>Show SAC Rate</source> + <translation>顯示SAC率</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="430"/> + <source>Enable / Disable the Ruler</source> + <translation>啓動/關閉標尺</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Preferences</source> <translation>環境設定</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="708"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="719"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="737"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Add Dive</source> <translation>增加潛水</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="756"/> + <location filename="../qt-ui/mainwindow.ui" line="792"/> <source>Auto Group</source> <translation>增加群組</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="772"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="780"/> + <location filename="../qt-ui/mainwindow.ui" line="816"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="788"/> + <location filename="../qt-ui/mainwindow.ui" line="824"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="796"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="801"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Prev DC</source> <translation>上一個 DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="804"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Left</source> <translation>左邊</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="809"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>Next DC</source> <translation>下一個 DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="812"/> + <location filename="../qt-ui/mainwindow.ui" line="848"/> <source>Right</source> <translation>右邊</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="817"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Select Events</source> <translation>選擇事件</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>Input Plan</source> <translation>輸入計畫</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="827"/> + <location filename="../qt-ui/mainwindow.ui" line="863"/> <source>About Subsurface</source> <translation>關於 Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </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"/> + <translation>導入檔案文件</translation> </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"/> + <translation>從其他程序導入潛水檔案文件</translation> </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"/> + <translation>&全屏顯示</translation> </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"/> + <translation>觸發全屏顯示</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="884"/> + <location filename="../qt-ui/mainwindow.ui" line="920"/> <source>F11</source> - <translation type="unfinished"/> + <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="143"/> + <location filename="../qt-ui/mainwindow.cpp" line="173"/> <source>Open File</source> <translation>開啟檔案</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>在關閉檔案前, 請儲存或取消此次潛水的編輯.</translation> </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>在開始計畫潛水前, 請先儲存或取消此次潛水的編輯.</translation> </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>在新增潛水前, 請先儲存或取消此次潛水的編輯.</translation> </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>您是否要對檔案 %1 所做的修改儲存?</translation> </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>您是否要對資料檔案所做的修改進行儲存?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="571"/> + <location filename="../qt-ui/mainwindow.cpp" line="635"/> <source>Save Changes?</source> <translation>儲存變更?</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>如果不進行儲存, 所做變更將會遺失.</translation> </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>另存新檔</translation> </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>提醒</translation> </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>在開啟新檔前, 請儲存或取消此次潛水的編輯.</translation> </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>UDDF 檔案 (*.uddf *.UDDF)</translation> </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>年統計</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>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation> </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"/> + <translation>打開潛水檔案文件</translation> </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"/> + <translation>潛水檔案文件(*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML 文件 (*.xml);;UDDF/UDCF 文件(*.uddf *.udcf);;JDiveLog 文件(*.jlb);;Suunto 文件(*.sde *.db);;CSV 文件(*.csv);;所有文件(*)</translation> </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"/> + <translation>請在嘗試其他編輯時先完成當前編輯</translation> </message> </context> <context> @@ -1792,185 +1838,200 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/preferences.ui" line="237"/> <source>Animations</source> - <translation type="unfinished"/> + <translation>動畫演示</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="243"/> <source>Speed</source> + <translation>速度</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="270"/> + <source>Subsurface Webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="289"/> + <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>系統</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="323"/> <source>Metric</source> <translation>公制</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="333"/> <source>Imperial</source> <translation>英制</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="316"/> + <location filename="../qt-ui/preferences.ui" line="343"/> <source>Personalize</source> <translation>個人化</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="367"/> <source>Depth</source> <translation>深度</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="347"/> + <location filename="../qt-ui/preferences.ui" line="374"/> <source>meter</source> <translation>meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="384"/> <source>feet</source> <translation>feet</translation> </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>liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="411"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>cu ft</source> <translation>cu ft</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="428"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>celsius</source> <translation>攝氏</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="438"/> + <location filename="../qt-ui/preferences.ui" line="465"/> <source>fahrenheit</source> <translation>華氏</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="455"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <source>kg</source> <translation>kg</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"/> + <translation>顯示pO2界限</translation> </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"/> + <translation>顯示pN2界限</translation> </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"/> + <translation>顯示pHe界限</translation> </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"/> + <translation>顯示MOD最大ppO2</translation> </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"/> + <translation>畫出潛水設備回報的警戒深度</translation> </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>系統預設</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="743"/> + <location filename="../qt-ui/preferences.ui" line="767"/> <source>Filter</source> <translation>篩選器</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="394"/> <source>Pressure</source> <translation>壓力</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="421"/> <source>Volume</source> <translation>容量</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="421"/> + <location filename="../qt-ui/preferences.ui" line="448"/> <source>Temperature</source> <translation>溫度</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="448"/> + <location filename="../qt-ui/preferences.ui" line="475"/> <source>Weight</source> <translation>重量</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>時間單位</translation> </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>上升/下降速度單位</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="493"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Minutes</source> <translation>分</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="503"/> + <location filename="../qt-ui/preferences.ui" line="530"/> <source>Seconds</source> <translation>秒</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="549"/> + <location filename="../qt-ui/preferences.ui" line="562"/> <source>Show</source> <translation>顯示</translation> </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>最大深度的 GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="667"/> + <location filename="../qt-ui/preferences.ui" line="691"/> <source>Misc</source> <translation>其它</translation> </message> @@ -1980,32 +2041,32 @@ Please, remove them first.</source> <translation>環境設定</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="673"/> + <location filename="../qt-ui/preferences.ui" line="697"/> <source>GFLow</source> <translation>GFlow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="690"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>GFHigh</source> <translation>GFhigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="219"/> + <location filename="../qt-ui/preferences.cpp" line="225"/> <source>Restart required</source> <translation>需要重新啟動</translation> </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>您必須重新啟動 Subsurface 來正確載入新的語言</translation> </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>開啟預設的日誌檔案</translation> </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>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation> </message> @@ -2013,22 +2074,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>預覽</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="36"/> + <location filename="../qt-ui/printdialog.cpp" line="42"/> <source>P&rint</source> <translation>列印</translation> </message> <message> - <location filename="../qt-ui/printdialog.cpp" line="40"/> - <source>&Close</source> - <translation>關閉</translation> - </message> - <message> - <location filename="../qt-ui/printdialog.cpp" line="55"/> + <location filename="../qt-ui/printdialog.cpp" line="58"/> <source>Print</source> <translation>列印</translation> </message> @@ -2154,72 +2210,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>未知</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>潛水 #%1 - %2</translation> </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>最大深度: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1896"/> + <location filename="../qt-ui/models.cpp" line="1913"/> <source>Duration: %1 min</source> <translation>區間: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1901"/> + <location filename="../qt-ui/models.cpp" line="1918"/> <source>Gas Used:</source> <translation>消耗氣體: </translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1903"/> + <location filename="../qt-ui/models.cpp" line="1920"/> <source>SAC:</source> <translation>耗氣率: </translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1905"/> + <location filename="../qt-ui/models.cpp" line="1922"/> <source>Max. CNS:</source> <translation>最大 CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1907"/> + <location filename="../qt-ui/models.cpp" line="1924"/> <source>Weights:</source> <translation>配重:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1912"/> + <location filename="../qt-ui/models.cpp" line="1929"/> <source>Notes:</source> <translation>記錄:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1919"/> + <location filename="../qt-ui/models.cpp" line="1936"/> <source>Divemaster:</source> <translation>導潛:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1921"/> + <location filename="../qt-ui/models.cpp" line="1938"/> <source>Buddy:</source> <translation>潛伴:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1923"/> + <location filename="../qt-ui/models.cpp" line="1940"/> <source>Suit:</source> <translation>防寒衣:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1925"/> + <location filename="../qt-ui/models.cpp" line="1942"/> <source>Viz:</source> <translation>Viz:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1927"/> + <location filename="../qt-ui/models.cpp" line="1944"/> <source>Rating:</source> <translation>評分:</translation> </message> @@ -2227,40 +2283,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>增加氣瓶交換</translation> </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>增加書籤</translation> </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>移除事件</translation> </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>隱藏相似事件</translation> </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>取消隱藏所有事件</translation> </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>空氣</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>移除此點</translation> </message> @@ -2270,22 +2361,22 @@ Please, remove them first.</source> <translation>關閉</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Average</source> <translation>平均</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="35"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Minimum</source> <translation>最低</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="38"/> + <location filename="../qt-ui/simplewidgets.cpp" line="39"/> <source>Maximum</source> <translation>最高</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>在地圖上移動, 並且雙擊來設定潛水位置</translation> </message> @@ -2293,12 +2384,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>重新編號</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>新的開始編號</translation> </message> @@ -2306,80 +2397,96 @@ 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>移動所選擇的時間</translation> </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"/> + <translation>移動圖片的時間根據</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="99"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="102"/> <source>earlier</source> <translation>較早</translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="106"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="109"/> <source>later</source> <translation>較晚</translation> </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"/> - <source>Determine camera time offset</source> - <translation type="unfinished"/> - </message> <message> <location filename="../qt-ui/shiftimagetimes.ui" line="155"/> + <source>Determine camera time offset</source> + <translation>選擇攝像頭時間差</translation> + </message> + <message> + <location filename="../qt-ui/shiftimagetimes.ui" line="158"/> <source>Select image of divecomputer showing time</source> - <translation type="unfinished"/> + <translation>選擇潛水機器時間顯示圖片</translation> </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"/> + <translation>哪個日期和時間將會被顯示在圖片上?</translation> </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"/> + <translation>打開圖片文件</translation> </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"/> + <translation>圖片文件類型(*.jpg*.jpeg*.pnm*.tif*.tiff)</translation> </message> </context> <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>移動所選擇的時間</translation> </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>移動所選擇潛水的時間,根據 </translation> </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>h:mm</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="83"/> + <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>earlier</source> <translation>較早</translation> </message> <message> - <location filename="../qt-ui/shifttimes.ui" line="90"/> + <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>later</source> <translation>較晚</translation> </message> @@ -2409,48 +2516,48 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/about.cpp" line="12"/> <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation type="unfinished"/> + <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></translation> </message> </context> <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>網頁服務</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Connecting...</source> <translation>連結...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="416"/> <source>Download finished</source> <translation>下載結束</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/> <source>Download error: %1</source> <translation>下載失敗: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/> <source>Connection Error: </source> <translation>連結錯誤:</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>錯誤的使用者 Id !</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>回覆無法解析!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> <source>Download Success!</source> <translation>下載成功!</translation> </message> @@ -2466,17 +2573,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>描述</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="835"/> + <location filename="../qt-ui/models.cpp" line="852"/> <source>ml</source> <translation>ml</translation> </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> @@ -2489,6 +2596,49 @@ Please, remove them first.</source> <translation>資訊</translation> </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> @@ -2505,12 +2655,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>描述</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="706"/> + <location filename="../qt-ui/models.cpp" line="723"/> <source>kg</source> <translation>kg</translation> </message> @@ -2544,11 +2694,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>密碼</translation> </message> <message> - <location filename="../qt-ui/webservices.ui" line="99"/> + <location filename="../qt-ui/webservices.ui" line="106"/> <source>Upload</source> <translation>上傳</translation> </message> @@ -2566,37 +2721,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>類型</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="356"/> + <location filename="../qt-ui/models.cpp" line="368"/> <source>Weight</source> <translation>重量</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>按此處移除配重系統</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="441"/> + <location filename="../qt-ui/models.cpp" line="453"/> <source>kg</source> <translation>kg</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> @@ -2604,79 +2759,79 @@ 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>年 > 月 / 旅程</translation> </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>區間 全部</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source> Average</source> <translation> 平均</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1651"/> + <location filename="../qt-ui/models.cpp" line="1668"/> <source> Shortest</source> <translation> 最短</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1654"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source> Longest</source> <translation> 最長</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>Depth (%1) Average</source> <translation>深度 (%1) 平均</translation> </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> 最小</translation> </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> 最大</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1666"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>SAC (%1) Average</source> <translation>耗氣率 (%1) 平均</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1675"/> + <location filename="../qt-ui/models.cpp" line="1692"/> <source>Temp. (%1) Average</source> <translation>溫度 (%1) @@ -2686,72 +2841,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>kg</translation> </message> <message> - <location filename="../dive.c" line="1104"/> + <location filename="../dive.c" line="1105"/> <source>(%s) or (%s)</source> <translation>(%s) 或 (%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> @@ -2783,250 +2938,246 @@ Maximum</source> <translation>吊掛式</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>無法讀取 '%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>CSV 匯入最大支援 %d 欄位.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>無</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>減壓停留</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>上升</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>深度</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>工作量</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>發射器</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>違反</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>書籤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>水面</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>安全停留</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>氣瓶更換</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>安全停留 (非必要)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>安全停留 (強制性)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>深停留</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>深度 (安全停留)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>潛水時間</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>below floor</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>最大深度</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>空氣時間</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>標題</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>組織等級警告</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>無停留時間</translation> </message> <message> - <location filename="../libdivecomputer.c" line="161"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>錯誤的事件編號</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>無法建立解析 %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="409"/> + <location filename="../libdivecomputer.c" line="411"/> <source>Error registering the data</source> <translation>錯誤的登錄資料</translation> </message> <message> - <location filename="../libdivecomputer.c" line="417"/> + <location filename="../libdivecomputer.c" line="419"/> <source>Error parsing the datetime</source> <translation>日期時間解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Dive %d: %s %d %04d</source> <translation>潛水 %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>潛水時間解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="449"/> <source>Error parsing the maxdepth</source> <translation>最大深度解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> <translation>混合氣體數量解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="468"/> + <location filename="../libdivecomputer.c" line="470"/> <source>Error obtaining water salinity</source> <translation>得到錯誤的海水鹽度</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="478"/> <source>Error obtaining surface pressure</source> <translation>得到錯誤的水面壓力</translation> </message> <message> - <location filename="../libdivecomputer.c" line="484"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the gas mix</source> <translation>混合氣體解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="493"/> <source>Error parsing the samples</source> <translation>樣本解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="623"/> <source>Event: waiting for user action</source> <translation>事件: 等待使用者動作</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>型號=%u (0x%08x), 韌體=%u (0x%08x), 序號=%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>錯誤的註冊程序.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="694"/> + <location filename="../libdivecomputer.c" line="696"/> <source>Error registering the cancellation handler.</source> <translation>錯誤的註冊取消程序.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="717"/> <source>Dive data import error</source> <translation>匯入潛水資料錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="754"/> + <location filename="../libdivecomputer.c" line="756"/> <source>Unable to create libdivecomputer context</source> <translation>無法建立 libdivecomputer 上下文</translation> </message> <message> - <location filename="../libdivecomputer.c" line="761"/> + <location filename="../libdivecomputer.c" line="763"/> <source>Unable to open %s %s (%s)</source> <translation> 無法開啟 %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>有問題的讀取比例 %s @@ -3034,85 +3185,79 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1625"/> - <source>Failed to parse '%s'. -</source> - <translation>無法解析訊息 '%s' . -</translation> - </message> - <message> - <location filename="../parse-xml.c" line="1626"/> <source>Failed to parse '%s'</source> <translation>無法解析訊息 '%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>資料庫讀取 get_events 失敗. </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"/> + <translation>數據庫請求get_tags失敗</translation> </message> <message> - <location filename="../file.c" line="176"/> + <location filename="../file.c" line="166"/> <source>Database connection failed '%s'. </source> <translation>資料庫連結錯誤 '%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>資料庫要求錯誤 '%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>無法開啟樣式 %s</translation> </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>無法找到氣源 %d/%d</translation> </message> <message> - <location filename="../planner.c" line="324"/> + <location filename="../planner.c" line="308"/> <source>Too many gas mixes</source> <translation>太多氣體混合</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 @@ -3125,357 +3270,363 @@ Subsurface 潛水計畫 </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>禁搭飛機 %.*f %s 在 %d:%02d min - 運行時間 %d:%02u 在 %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 停留 %d:%02d min - 時間運行 %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>更換氣體至 %s </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="558"/> <source>Gas consumption: </source> <translation>氣體消耗: </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"/> + <translation>T: %.1f%s</translation> + </message> + <message> + <location filename="../profile.c" line="1239"/> + <source>V: %.1f%s +</source> + <translation>V: %.1f%s</translation> + </message> + <message> + <location filename="../profile.c" line="1242"/> + <source>SAC: %2.1fl/min +</source> + <translation>SAC: %2.1fl/分鐘</translation> </message> <message> <location filename="../profile.c" line="1244"/> - <source>V: %.1f%s -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1247"/> - <source>SAC: %2.1fl/min -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1249"/> <source>CNS: %u%% </source> - <translation type="unfinished"/> + <translation>CNS: %u%%</translation> </message> <message> - <location filename="../profile.c" line="1251"/> + <location filename="../profile.c" line="1246"/> <source>pO%s: %.2fbar </source> - <translation type="unfinished"/> + <translation>pO%s: %.2fbar</translation> + </message> + <message> + <location filename="../profile.c" line="1248"/> + <source>pN%s: %.2fbar +</source> + <translation>pN%s: %.2fbar</translation> + </message> + <message> + <location filename="../profile.c" line="1250"/> + <source>pHe: %.2fbar +</source> + <translation>pHe: %.2fbar</translation> </message> <message> <location filename="../profile.c" line="1253"/> - <source>pN%s: %.2fbar -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1255"/> - <source>pHe: %.2fbar -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile.c" line="1258"/> <source>MOD: %d%s </source> - <translation type="unfinished"/> + <translation>MOD: %d%s</translation> </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>%sT: %d:%02d min</translation> </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>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1430"/> + <location filename="../profile.c" line="1435"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1434"/> + <location filename="../profile.c" line="1439"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </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>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1449"/> + <location filename="../profile.c" line="1454"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="308"/> + <location filename="../qt-gui.cpp" line="273"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="311"/> + <location filename="../qt-gui.cpp" line="276"/> <source>F</source> <translation>F</translation> </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>%1, %2 %3, %4 %5:%6</translation> </message> <message> - <location filename="../qt-gui.cpp" line="511"/> + <location filename="../qt-gui.cpp" line="405"/> <source>%1 %2, %3 %4:%5</source> <translation>%1 %2, %3 %4:%5</translation> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="418"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 潛水)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="529"/> + <location filename="../qt-gui.cpp" line="423"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 潛水)</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>boat</source> <translation>船潛</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>shore</source> <translation>岸潛</translation> </message> <message> - <location filename="../dive.c" line="13"/> + <location filename="../dive.c" line="14"/> <source>drift</source> <translation>放流</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>deep</source> <translation>深潛</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>cavern</source> <translation>地洞</translation> </message> <message> - <location filename="../dive.c" line="14"/> + <location filename="../dive.c" line="15"/> <source>ice</source> <translation>冰潛</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>wreck</source> <translation>沈船</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>cave</source> <translation>洞穴</translation> </message> <message> - <location filename="../dive.c" line="15"/> + <location filename="../dive.c" line="16"/> <source>altitude</source> <translation>高海拔</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>pool</source> <translation>泳池</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>lake</source> <translation>湖泊</translation> </message> <message> - <location filename="../dive.c" line="16"/> + <location filename="../dive.c" line="17"/> <source>river</source> <translation>河流</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>night</source> <translation>夜潛</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>fresh</source> <translation>新進</translation> </message> <message> - <location filename="../dive.c" line="17"/> + <location filename="../dive.c" line="18"/> <source>student</source> <translation>學生</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>photo</source> <translation>照片</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>video</source> <translation>影片</translation> </message> <message> - <location filename="../dive.c" line="18"/> + <location filename="../dive.c" line="19"/> <source>instructor</source> <translation>教練</translation> </message> <message> - <location filename="../dive.c" line="19"/> + <location filename="../dive.c" line="20"/> <source>deco</source> <translation>減壓</translation> </message> @@ -3525,97 +3676,97 @@ EADD: %d%s <translation>(無潛水)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sun</source> <translation>周日</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Mon</source> <translation>周一</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Tue</source> <translation>周二</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Wed</source> <translation>周三</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Thu</source> <translation>周四</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Fri</source> <translation>周五</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="63"/> + <location filename="../subsurfacestartup.c" line="65"/> <source>Sat</source> <translation>周六</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jan</source> <translation>1月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Feb</source> <translation>2月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Mar</source> <translation>3月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Apr</source> <translation>4月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>May</source> <translation>5月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="72"/> + <location filename="../subsurfacestartup.c" line="74"/> <source>Jun</source> <translation>6月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Jul</source> <translation>7月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Aug</source> <translation>8月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Sep</source> <translation>9月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Oct</source> <translation>10月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Nov</source> <translation>11月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="73"/> + <location filename="../subsurfacestartup.c" line="75"/> <source>Dec</source> <translation>12月</translation> </message>