diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-11-24 07:25:21 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-11-24 07:25:33 -0800 |
| commit | f32e6a853e0230c5862cdd15112aef2232f90b2d (patch) | |
| tree | ed2154be2a78efb5a10f753e43c625fff961695a /translations | |
| parent | 4a751750e0e18a6c71ee63930faf91b799c53d0b (diff) | |
| download | subsurface-f32e6a853e0230c5862cdd15112aef2232f90b2d.tar.gz | |
Latest strings and translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations')
29 files changed, 7333 insertions, 5129 deletions
diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts index 3fdfb54b2..253011a14 100644 --- a/translations/subsurface_bg_BG.ts +++ b/translations/subsurface_bg_BG.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation>Няма партньори</translation> </message> @@ -2323,17 +2323,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation>Фърмуера не може да бъде обновен!</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation>Не може да се осъществи връзка с леководолазния компютър.</translation> </message> @@ -2357,7 +2357,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation>Няма зададено местонахождение</translation> </message> @@ -2580,13 +2580,13 @@ </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Запиши</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Отмяна</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2720,32 +2720,32 @@ mixed from Air and using: <translation>&Файл</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>Превключи pHе диаграма</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>Превключи калкулация на всички тъкани</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>Превключи отчетен таван на гмуркачески компютър</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Превключи калкулиран таван</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>Превключи NDL. TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Превключи калкулиран таван с 3м нарастване</translation> </message> @@ -2755,42 +2755,42 @@ mixed from Air and using: <translation>Настрой &леководолазен комютър</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation>Планирай гмуркане &наново</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation>Превключи pО2 диаграма</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation>Превключи pN2 диаграма</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Превключи показване на пулс</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>Превключи MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>Превключи EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>Превключи SAC скорост</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>Превключи линеал</translation> </message> @@ -2859,6 +2859,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Отвори</translation> </message> @@ -3018,32 +3019,32 @@ p, li { white-space: pre-wrap; } <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation>Скалирай диаграмата</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation>Превключи изображения</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation>Преключи бутилки</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation>&Филтрирай списъка</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation>Превключи тъканна диаграма</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> @@ -3208,80 +3209,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Отвори файл</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Отмяна</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Напечатай рунтайм таблица</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Годишни статистики</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Желаете ли да запишете промените във файла %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Желаете ли да запишете промените във файла с данни?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Запиши промените?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Запиши файла като</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Отвори регистър файл</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation>Регистър файлове (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran файлове (*.can);;CSV файлове (*.csv);;DiveLog.de файлове (*.dld);;JDiveLog файлове (*.jlb);;Liquivision файлове (*.lvd);;MkVI файлове (*.txt);;Suunto файлове (*.sde *.db);;UDDF/UDCF файлове (*.uddf *.udcf);;XML файлове (*.xml);;Всички файлове (*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <source>Changes will be lost if you don't save them.</source> <translation>Промените ще бъдат изгубени ако не ги запишете.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Моля, първо приключете с редакцията преди да започнете нова.</translation> </message> @@ -3942,82 +3953,88 @@ p, li { white-space: pre-wrap; } <translation>Показването на NDL / TTS бе изключено поради прекалено дълго време за обработка на данните</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>Направи първи гмуркачески компютър</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Изтрий този гмуркачески компютър</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Добави промяна на газа</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation>(Танк %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Добави бележка</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>Премахни събитие</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Премахни малки събития</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Редактирай име</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Покажи всички събития</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Скрий събития</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Скрий всички %1 събития?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Премахни избраните събития?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Редактирай име в показалец</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Потребителско име:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation> Името е прекалено дълго!</translation> </message> @@ -4128,12 +4145,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation>Не може да се осъществи връзка с леководолазния компютър.</translation> </message> @@ -4160,12 +4177,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation>Не може да се осъществи връзка с леководолазния компютър.</translation> </message> @@ -4397,7 +4414,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation>Празни тагове</translation> </message> @@ -4736,12 +4753,12 @@ OS CPU архитектура %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation>Не може да се осъществи връзка с леководолазния компютър.</translation> </message> @@ -4902,15 +4919,15 @@ Maximum</source> <translation>кг</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) или (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>въздух</translation> </message> @@ -4940,27 +4957,63 @@ Maximum</source> <translation>щипка</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Не може да бъде прочетен '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Проблем при Poseidon импорт: не може да бъде прочетен '%s'</translation> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation>Няма подходящ Л.К. за файла '%s'</translation> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Максималният потдържан брой на CSV колони е %d</translation> </message> @@ -4979,6 +5032,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation>батерия</translation> </message> @@ -4992,6 +5046,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>покачване</translation> @@ -5038,6 +5093,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5124,107 +5180,107 @@ Maximum</source> <translation>грешен номер на събитие</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <source>Unable to create parser for %s %s</source> <translation>Не може да бъде създаден разряд за %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Грешка при регистриране на данни</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Грешка при разряд на дата и час</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Гмуркане №%d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Грешка при рaзряд на време за гмуркане</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Грешка при рaзряд на максимална дълбочина</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation>Грешка при рaзряд на температура</translation> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation>Грешка при рaзряд на газ микс брой</translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Грешка при прием на водна соленост</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Грешка при прием на повърхностно налягане</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation>Грешка при прием на режим на гмуркане</translation> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Грешка при рaзряд на газ микс</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Грешка при рaзряд на стойности</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Събитие: изчаквание на действие от потребителя</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Грешка при регистриране на направление за събития</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Грешка при регистриране на направление за отменяне</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Грешка при вход на данни</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Не може да бъде създаден libdivecomputer контекст</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Не може да бъдe отворен %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Недостатъчни привилегии да бъде отврено устройсто %s %s (%s)</translation> </message> @@ -5242,7 +5298,7 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Базата данни не може да изпълни get_events. @@ -5250,51 +5306,51 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>Базата данни не може да изпълни get_tags. </translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Няма връзка към базата данни '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Грешка при заява към база данни '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation>Базата данни не може да изпълни get_cylinders. </translation> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation>Базата данни не може да изпълни get_changes. </translation> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation>Базата данни не може да изпълни get_profile_sample. </translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Не може да бъде отворен стилов файл %s</translation> </message> @@ -5304,7 +5360,7 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>Не може да бъде намерен газ %s</translation> </message> @@ -5349,56 +5405,76 @@ Maximum</source> <translation>газ</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <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="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <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="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dмин</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Превключи газ на %s</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Консумация на газ (CCR крака включени):</translation> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Консумация на газ:</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Предупреждение:</translation> </message> @@ -5408,37 +5484,37 @@ Maximum</source> <translation>ВНИМАНИЕ: ТОВА Е НОВО ИЗПЪЛНЕНИЕ НА АГЛОРИТЪМА НА БУЛМАН И НА ПЛАНОВИКА, КОИТО НЕ СА ТЕСТВАНИ ДОСТАТЪЧНО. МОЛЯ НЕ ПЛАНУВАЙТЕ ИЗТИНСКИ ГМУРКАНИЯ БАЗИРАНИ НА ДАННИТЕ ТУК!</translation> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>има повече газ от този на разположение в избраната бултилка</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>няма достатъчно резерв за газово споделяне при изкачване!</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s от %s (%.0f%s/%.0f%s в планирано покачване)</translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s по време на плануваното изкачване) на %s</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>висока pO₂ стойност %.2f при %d:%02u с газ %s на дълбочина %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5447,70 +5523,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/мин </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fбара </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fбара </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fбар </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5519,7 +5595,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5528,14 +5604,14 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Стоп: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Стоп: неопр. време @ %.0f%s @@ -5543,77 +5619,77 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: неопр. време @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>В Deco </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>NDL: %uмин </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>TTS: %uмин </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %uмин @ %.0f%s (калк.) </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>В Deco (калк.) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>NDL: %uмин (калк.) </translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TTS: %uмин (калк.) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Калкулиран таван %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Тъкан %.0fмин: %.0f%s @@ -5621,51 +5697,51 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>пулс: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>лагер: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d мин</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts index a61878641..1cc6b22e8 100644 --- a/translations/subsurface_da_DK.ts +++ b/translations/subsurface_da_DK.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation>Ingen makkere</translation> </message> @@ -340,12 +340,12 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="64"/> <source>Read settings from backup file or from device before writing to the device</source> - <translation type="unfinished"/> + <translation>Læs indstillingerne fra backup eller fra enheden inden skrivning til enheden</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="90"/> <source>Read settings from backup file or from device before writing to a backup file</source> - <translation type="unfinished"/> + <translation>Læs indstillingerne fra backup eller fra enheden inden skrivning til backup</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> @@ -412,7 +412,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> <source>Suunto Vyper family</source> - <translation type="unfinished"/> + <translation>Suunto Vyper familie</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> @@ -634,17 +634,17 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1148"/> <source>Fixed setpoint</source> - <translation type="unfinished"/> + <translation>Fast setpoint</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1153"/> <source>Sensor</source> - <translation type="unfinished"/> + <translation>Sensor</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1161"/> <source>Setpoint fallback</source> - <translation type="unfinished"/> + <translation>Setpoint backup</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1184"/> @@ -658,40 +658,40 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> - <translation type="unfinished"/> + <translation>ppO₂ max</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> - <translation type="unfinished"/> + <translation>ppO₂ min</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> <source>P1 (medium)</source> <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> + <translation>P1 (medium)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> <source>P2 (high)</source> <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> + <translation>P2 (high)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> <source>Total dive time</source> - <translation type="unfinished"/> + <translation>Totel dykker tid</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> <source>kg/ℓ</source> - <translation type="unfinished"/> + <translation>kg/ℓ</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> <source>Apnoea</source> - <translation type="unfinished"/> + <translation>Apnø</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/> @@ -712,7 +712,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1317"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1759"/> <source>Number of dives</source> - <translation type="unfinished"/> + <translation>Antal dyk</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1377"/> @@ -723,7 +723,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1424"/> <source>P0 (none)</source> <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> + <translation>P0 (ingen)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> @@ -733,22 +733,22 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1455"/> <source>20s</source> - <translation type="unfinished"/> + <translation>20s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1460"/> <source>30s</source> - <translation type="unfinished"/> + <translation>30s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1465"/> <source>60s</source> - <translation type="unfinished"/> + <translation>60s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> - <translation type="unfinished"/> + <translation>Computer model</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1497"/> @@ -759,17 +759,17 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1511"/> <source>24h</source> - <translation type="unfinished"/> + <translation>24h</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1516"/> <source>12h</source> - <translation type="unfinished"/> + <translation>12h</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1524"/> <source>Time format</source> - <translation type="unfinished"/> + <translation>Tids format</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1539"/> @@ -784,7 +784,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1555"/> <source>s</source> - <translation type="unfinished"/> + <translation>s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1562"/> @@ -794,12 +794,12 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1579"/> <source>Depth alarm</source> - <translation type="unfinished"/> + <translation>Dybde alarm</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1599"/> <source>Time alarm</source> - <translation type="unfinished"/> + <translation>Tids alarm</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1624"/> @@ -809,37 +809,37 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> - <translation type="unfinished"/> + <translation>MM/DD/YY</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1746"/> <source>DD/MM/YY</source> - <translation type="unfinished"/> + <translation>DD/MM/YY</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1751"/> <source>YY/MM/DD</source> - <translation type="unfinished"/> + <translation>YY/MM/DD</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1935"/> <source>ZH-L16 CC</source> - <translation type="unfinished"/> + <translation>ZH-L16 CC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> - <translation type="unfinished"/> + <translation>L16-GF OC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1950"/> <source>L16-GF CC</source> - <translation type="unfinished"/> + <translation>L16-GF CC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1955"/> <source>PSCR-GF</source> - <translation type="unfinished"/> + <translation>PSCR-GF</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="621"/> @@ -882,12 +882,12 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> <source>Restore dive computer settings</source> - <translation type="unfinished"/> + <translation>Gendan dykker computer indstillinger</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="951"/> <source>XML restore error</source> - <translation type="unfinished"/> + <translation>XML gendannelses fejl</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="952"/> @@ -898,22 +898,22 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="959"/> <source>Restore succeeded</source> - <translation type="unfinished"/> + <translation>Gendannet med succes</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="960"/> <source>Your settings have been restored successfully.</source> - <translation type="unfinished"/> + <translation>Dine indstillinger er blevet gendannet med succes.</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="971"/> <source>Select firmware file</source> - <translation type="unfinished"/> + <translation>Vælg firmware fil</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="972"/> <source>All files (*.*)</source> - <translation type="unfinished"/> + <translation>Alle filer(*.*)</translation> </message> </context> <context> @@ -961,7 +961,7 @@ <message> <location filename="../qt-ui/models.cpp" line="79"/> <source>Use</source> - <translation type="unfinished"/> + <translation>Brug</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="191"/> @@ -1004,7 +1004,7 @@ <message> <location filename="../qt-ui/divecomponentselection.ui" line="60"/> <source>GPS coordinates</source> - <translation type="unfinished"/> + <translation>GPS koordinater</translation> </message> <message> <location filename="../qt-ui/divecomponentselection.ui" line="67"/> @@ -1130,7 +1130,7 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/models.cpp" line="1249"/> <source>Depth(%1)</source> - <translation type="unfinished"/> + <translation>Dybde(%1)</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1249"/> @@ -1150,12 +1150,12 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/models.cpp" line="1255"/> <source>Temp(%1%2)</source> - <translation type="unfinished"/> + <translation>Temp(%1%2)</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1258"/> <source>Weight(%1)</source> - <translation type="unfinished"/> + <translation>Vægt(%1)</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1258"/> @@ -1180,12 +1180,12 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/models.cpp" line="1267"/> <source>Gas</source> - <translation type="unfinished"/> + <translation>Gas</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1272"/> <source>SAC(%1)</source> - <translation type="unfinished"/> + <translation>SAC(%1)</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1272"/> @@ -1383,7 +1383,7 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> <source>Export yearly statistics</source> - <translation type="unfinished"/> + <translation>Exporter årlig statistik</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> @@ -1736,7 +1736,7 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/diveplanner.ui" line="220"/> <source> kg/ℓ</source> - <translation type="unfinished"/> + <translation> kg/ℓ</translation> </message> </context> <context> @@ -1802,7 +1802,7 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> - <translation type="unfinished"/> + <translation>Gem ny</translation> </message> </context> <context> @@ -1855,7 +1855,7 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>Ambient pressure</source> - <translation type="unfinished"/> + <translation>Omgivende tryk</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> @@ -1888,7 +1888,7 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="14"/> <source>Dialog</source> - <translation type="unfinished"/> + <translation>Dialog</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="34"/> @@ -1898,17 +1898,17 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="48"/> <source>⌫</source> - <translation type="unfinished"/> + <translation>⌫</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> <source>Get user ID</source> - <translation type="unfinished"/> + <translation>Hent bruger ID</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="67"/> <source><html><head/><body><p><span style=" font-size:20pt; font-weight:600; color:#ff8000;">⚠</span> Not using a UserID means that you will need to manually keep bookmarks to your dives, to find them again.</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p><span style=" font-size:20pt; font-weight:600; color:#ff8000;">⚠</span> Uden bruger ID skal du manuelt holde styr på dine dyk</p></body></html></translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="80"/> @@ -1918,12 +1918,12 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="83"/> <source>Keep dives private</source> - <translation type="unfinished"/> + <translation>Behold dyk som private</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="105"/> <source>Upload dive data</source> - <translation type="unfinished"/> + <translation>Upload dykker data</translation> </message> </context> <context> @@ -1979,7 +1979,7 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/models.cpp" line="1499"/> <source>Weight(%1)</source> - <translation type="unfinished"/> + <translation>Vægt(%1)</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1456"/> @@ -1997,12 +1997,12 @@ fjerne den valgte dykkercomputer?</translation> <location filename="../qt-ui/models.cpp" line="1462"/> <location filename="../qt-ui/models.cpp" line="1508"/> <source>Gas</source> - <translation type="unfinished"/> + <translation>Gas</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1513"/> <source>SAC(%1)</source> - <translation type="unfinished"/> + <translation>SAC(%1)</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1513"/> @@ -2029,7 +2029,7 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/models.cpp" line="1490"/> <source>Depth(%1)</source> - <translation type="unfinished"/> + <translation>Dybde(%1)</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1447"/> @@ -2040,7 +2040,7 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/models.cpp" line="1496"/> <source>Temp(%1%2)</source> - <translation type="unfinished"/> + <translation>Temp(%1%2)</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1499"/> @@ -2267,7 +2267,7 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/> <source>Download into new trip</source> - <translation type="unfinished"/> + <translation>Download til ny tur</translation> </message> </context> <context> @@ -2275,12 +2275,12 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/models.cpp" line="2278"/> <source>Key</source> - <translation type="unfinished"/> + <translation>Nøgle</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="2278"/> <source>Value</source> - <translation type="unfinished"/> + <translation>Værdi</translation> </message> </context> <context> @@ -2322,19 +2322,19 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> - <translation type="unfinished"/> + <translation>Denne facilitet er endnu ikke tilgængelig for den valgte computer</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> - <translation type="unfinished"/> + <translation>Firmware update fejlede</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> - <translation type="unfinished"/> + <translation>Kunne ikke lave en forbindelse til dykker computeren</translation> </message> </context> <context> @@ -2350,15 +2350,15 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/simplewidgets.cpp" line="525"/> <source>Location: </source> - <translation type="unfinished"/> + <translation>Sted:</translation> </message> </context> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> - <translation type="unfinished"/> + <translation>Stedet er ikke sat</translation> </message> </context> <context> @@ -2478,12 +2478,12 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/maintab.ui" line="958"/> <source>Extra data</source> - <translation type="unfinished"/> + <translation>Ekstra data</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="964"/> <source>Additional data from dive computer</source> - <translation type="unfinished"/> + <translation>Yderligere data fra dykker computeren</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="305"/> @@ -2579,13 +2579,13 @@ fjerne den valgte dykkercomputer?</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Gem</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Fortryd</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2644,47 +2644,47 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/maintab.cpp" line="556"/> <source>Highest total SAC of a dive</source> - <translation type="unfinished"/> + <translation>Højeste total SAC på et dyk</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="557"/> <source>Lowest total SAC of a dive</source> - <translation type="unfinished"/> + <translation>Laveste total SAC på det dyk</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="558"/> <source>Average total SAC of all selected dives</source> - <translation type="unfinished"/> + <translation>Gennemsnitlig total SAC for alle valgte dyk</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Highest temperature</source> - <translation type="unfinished"/> + <translation>Højeste temperatur</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Lowest temperature</source> - <translation type="unfinished"/> + <translation>Laveste temperatur</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="571"/> <source>Average temperature of all selected dives</source> - <translation type="unfinished"/> + <translation>Gennemsnitlig temperatur af alle valgte dyk</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Longest dive</source> - <translation type="unfinished"/> + <translation>Længste dyk</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Shortest dive</source> - <translation type="unfinished"/> + <translation>Korteste dyk</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average length of all selected dives</source> - <translation type="unfinished"/> + <translation>Gennemsnit længde af alle valgte dyk</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="607"/> @@ -2719,77 +2719,77 @@ blandes fra Luft ved brug: <translation>&Fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>Skift pH2 graf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>Skift beregning af alle væv</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>Skift DC rapporteret loft</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Skift beregnet loft</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>Skift NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Skift beregnet loft med 3m stop</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>Configure &dive computer</source> - <translation type="unfinished"/> + <translation>Konfigurer &Dykker computer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> - <translation type="unfinished"/> + <translation>Genberegn &dyk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Skift hjerte frekvens</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>Skift MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>Skift EAD,END,EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>Skift SAC rate</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>Skift måler</translation> </message> @@ -2858,6 +2858,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Åben</translation> </message> @@ -2929,7 +2930,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>Ctrl+C</source> - <translation type="unfinished"/> + <translation>Ctrl+C</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="457"/> @@ -2939,7 +2940,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Ctrl+V</source> - <translation type="unfinished"/> + <translation>Ctrl+V</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="497"/> @@ -3014,37 +3015,37 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="638"/> <source>Ctrl+Shift+C</source> - <translation type="unfinished"/> + <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> - <translation type="unfinished"/> + <translation>Ctrl+F</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="390"/> @@ -3207,80 +3208,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Åben fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Fortryd</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Print runtime skema</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Årlig Statistik</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vil du gemme ændringerne du foretog på denne fil %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vil du gemme ændringerne du foretog på data filen?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Gem ændringer?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Gem fil som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Åben log fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"/> + <translation>Dykker log filer (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran filer (*.can);;CSV files (*.csv);;DiveLog.de filer (*.dld);;JDiveLog filer (*.jlb);;Liquivision filer (*.lvd);;MkVI filer (*.txt);;Suunto filer (*.sde *.db);;UDDF/UDCF filer (*.uddf *.udcf);;XML filer (*.xml);;Alle filer (*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Færdiggør denne rettelse inden du starter på en ny.</translation> </message> @@ -3308,12 +3319,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/diveplanner.cpp" line="488"/> <source>50% avg. depth to 20ft</source> - <translation type="unfinished"/> + <translation>50% gnm. dybde til 20ft</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="489"/> <source>20ft to surface</source> - <translation type="unfinished"/> + <translation>20ft til overflade</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="491"/> @@ -3328,24 +3339,24 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/diveplanner.cpp" line="493"/> <source>50% avg. depth to 6m</source> - <translation type="unfinished"/> + <translation>50% gnm. dybde til 6m</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="494"/> <source>6m to surface</source> - <translation type="unfinished"/> + <translation>6m til overflade</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="497"/> <location filename="../qt-ui/diveplanner.cpp" line="498"/> <source>cuft/min</source> - <translation type="unfinished"/> + <translation>cuft/min</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="506"/> <location filename="../qt-ui/diveplanner.cpp" line="507"/> <source>ℓ/min</source> - <translation type="unfinished"/> + <translation>ℓ/min</translation> </message> </context> <context> @@ -3794,7 +3805,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/printlayout.cpp" line="71"/> <source>Subsurface cannot find a usable printer on this system!</source> - <translation type="unfinished"/> + <translation>Subsurface kan ikke finde en printer</translation> </message> </context> <context> @@ -3802,22 +3813,22 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/printoptions.ui" line="41"/> <source>&6 dives per page</source> - <translation type="unfinished"/> + <translation>&6 dyk pr side</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="57"/> <source>&1 dive per page</source> - <translation type="unfinished"/> + <translation>&1 dyk pr side</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="70"/> <source>&2 dives per page</source> - <translation type="unfinished"/> + <translation>&2 dyk pr side</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="83"/> <source>&Table print</source> - <translation type="unfinished"/> + <translation>&Table print</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="106"/> @@ -3837,12 +3848,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/printoptions.ui" line="153"/> <source>Prof&ile on top</source> - <translation type="unfinished"/> + <translation>Prof&ile i toppen</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="169"/> <source>&Notes on top</source> - <translation type="unfinished"/> + <translation>&Noter i toppen</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="29"/> @@ -3941,84 +3952,90 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>Vælg som 1. dykkercomputer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Slet denne dykkercomputer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Tilføj gas skift</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Tilføj bookmark</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>Slet hændelse</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Skjul tilsvarende hændelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Rediger navn</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Vis alle hændelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Skjul hændelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Skjul alle %1 hændelser?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Fjern de valgte hændelser?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Rediger bogmærke navn</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Brugerdefineret navn:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> - <translation type="unfinished"/> + <translation>Navn er for langt!</translation> </message> </context> <context> @@ -4031,7 +4048,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/diveplanner.cpp" line="39"/> <source>OXYGEN</source> - <translation type="unfinished"/> + <translation>ILT</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="224"/> @@ -4127,14 +4144,14 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> - <translation type="unfinished"/> + <translation>Denne facilitet er endnu ikke tilgængelig for den valgte computer</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> - <translation type="unfinished"/> + <translation>Kunne ikke lave en forbindelse til dykker computeren</translation> </message> </context> <context> @@ -4159,14 +4176,14 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> - <translation type="unfinished"/> + <translation>Denne facilitet er endnu ikke tilgængelig for den valgte computer</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> - <translation type="unfinished"/> + <translation>Kunne ikke lave en forbindelse til dykker computeren</translation> </message> </context> <context> @@ -4360,7 +4377,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="550"/> <source>Suits: </source> - <translation type="unfinished"/> + <translation>Dragte:</translation> </message> </context> <context> @@ -4396,7 +4413,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4480,7 +4497,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/updatemanager.cpp" line="75"/> <source>Newest release version is </source> - <translation type="unfinished"/> + <translation>Nyeste udgave er</translation> </message> <message> <location filename="../qt-ui/updatemanager.cpp" line="76"/> @@ -4711,7 +4728,7 @@ OS CPU Arkitektur: %1</translation> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/> <source>Transferring data...</source> - <translation type="unfinished"/> + <translation>Overfører data...</translation> </message> </context> <context> @@ -4735,14 +4752,14 @@ OS CPU Arkitektur: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> - <translation type="unfinished"/> + <translation>Denne facilitet er endnu ikke tilgængelig for den valgte computer</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> - <translation type="unfinished"/> + <translation>Kunne ikke lave en forbindelse til dykker computeren</translation> </message> </context> <context> @@ -4901,15 +4918,15 @@ Gennemsnit</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>luft</translation> </message> @@ -4939,27 +4956,63 @@ Gennemsnit</translation> <translation>Clip-On</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Fejl i læsning af '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> + <translation>Poseidon import fejlede: Kunne ikke læse '%s'</translation> + </message> + <message> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maksimum antal kolonner i CSV import er %d</translation> </message> @@ -4978,8 +5031,9 @@ Gennemsnit</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> - <translation type="unfinished"/> + <translation>batteri</translation> </message> <message> <location filename="../cochran.c" line="366"/> @@ -4991,6 +5045,7 @@ Gennemsnit</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>opstigning</translation> @@ -5037,6 +5092,7 @@ Gennemsnit</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5123,109 +5179,109 @@ Gennemsnit</translation> <translation>Ugyldigt hændelses nummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Fejl i registrering af data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Fejl ved fortolkning af dato/tid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Dyk %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Fejl i fortolkning af dykkertid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Fejl i fortolkning af max dybde</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> - <translation type="unfinished"/> + <translation>Fejl ved læsning af temperatur</translation> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation>Fejl i fortolkning af antallet af gasser</translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Fejl i læsning af saltindhold i vandet</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Fejl ved at opnå overflade tryk</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Fejl i fortolkning af gas blanding</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Fejl i fortolkning af prøver</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Event: waiting for user action</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Fejl: registering the event handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Fejl: registering the cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Import fejl i dykker data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Kan ikke danne libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Kan ikke åbne %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> - <translation type="unfinished"/> + <translation>Utilstrækkelige privilegier til at åbne enheden %s %s (%s)</translation> </message> <message> <location filename="../parse-xml.c" line="506"/> @@ -5241,7 +5297,7 @@ Gennemsnit</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Database forespørgsel get_events fejlede @@ -5249,51 +5305,51 @@ Gennemsnit</translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>Database query get_tags failed. </translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Database forbindelse fejlede '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Database forespørgsel fejlede '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation>Database query get_cylinders failed. </translation> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation>Database query get_changes failed. </translation> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation>Database query get_profile_sample failed. </translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åbne stylesheet %s</translation> </message> @@ -5303,7 +5359,7 @@ Gennemsnit</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>Kan ikke finde gas %s</translation> </message> @@ -5348,56 +5404,76 @@ Gennemsnit</translation> <translation>gas</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Overgang til %.*f %s i %d:%02d min - runtime %d:%02u på %s</translation> </message> <message> - <location filename="../planner.c" line="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Stop på %.*f %s for %d:%02d min - runtime %d:%02u on %s</translation> </message> <message> - <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Skift gas til %s</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> - <translation type="unfinished"/> + <translation>Gas forbrug (CCR etaper udeladt)</translation> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Gas forbrug:</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Advarsel:</translation> </message> @@ -5407,37 +5483,37 @@ Gennemsnit</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>det er mere gas end der er tilrådighed i flasken!</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Ikke ekstra gas nok til deling ved opstigning</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s i planlagt opstigning)</translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s under planlagt opstigning) af %s</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>høj pO₂ værdi %.2f at %d:%02u med gas %s på dybde %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5447,7 +5523,7 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>P: %d%s @@ -5455,21 +5531,21 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min @@ -5477,42 +5553,42 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5521,7 +5597,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5530,137 +5606,137 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Sikkerhedsstop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Sikkerhedsstop: ukendt tid @ %.0f%s</translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: unkn time @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>I deko </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (calc)</translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>In deko (beregn)</translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (beregn)</translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (beregn)</translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Beregnet loft %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Væv %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>Hjertefrekvens: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>bærende: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s </translation> @@ -5783,17 +5859,17 @@ EADD: %d%s <message> <location filename="../dive.c" line="30"/> <source>OC-gas</source> - <translation type="unfinished"/> + <translation>OC-gas</translation> </message> <message> <location filename="../dive.c" line="30"/> <source>diluent</source> - <translation type="unfinished"/> + <translation>diluent</translation> </message> <message> <location filename="../dive.c" line="30"/> <source>oxygen</source> - <translation type="unfinished"/> + <translation>ilt</translation> </message> <message> <location filename="../dive.c" line="232"/> @@ -5978,12 +6054,12 @@ Er Uemis Zurich tilsluttet korrekt?</translation> <message> <location filename="../uemis-downloader.c" line="411"/> <source>%s %s</source> - <translation type="unfinished"/> + <translation>%s %s</translation> </message> <message> <location filename="../uemis-downloader.c" line="452"/> <source>divelog #</source> - <translation type="unfinished"/> + <translation>dykkerlog #</translation> </message> <message> <location filename="../uemis-downloader.c" line="454"/> @@ -6396,7 +6472,7 @@ Er Uemis Zurich tilsluttet korrekt?</translation> <message> <location filename="../save-html.c" line="504"/> <source>Gas</source> - <translation type="unfinished"/> + <translation>Gas</translation> </message> <message> <location filename="../save-html.c" line="505"/> @@ -6416,7 +6492,7 @@ Er Uemis Zurich tilsluttet korrekt?</translation> <message> <location filename="../save-html.c" line="509"/> <source>Value</source> - <translation type="unfinished"/> + <translation>Værdi</translation> </message> <message> <location filename="../save-html.c" line="510"/> @@ -6599,7 +6675,7 @@ Er Uemis Zurich tilsluttet korrekt?</translation> <location filename="../qt-ui/plannerSettings.ui" line="439"/> <location filename="../qt-ui/plannerSettings.ui" line="452"/> <source>ℓ/min</source> - <translation type="unfinished"/> + <translation>ℓ/min</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="468"/> @@ -6640,12 +6716,12 @@ Er Uemis Zurich tilsluttet korrekt?</translation> <message> <location filename="../qt-ui/plannerSettings.ui" line="132"/> <source>50% avg. depth to 6m</source> - <translation type="unfinished"/> + <translation>50% gnm. dybde til 6m</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="149"/> <source>6m to surface</source> - <translation type="unfinished"/> + <translation>6m til overflade</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="489"/> diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts index d65b996ba..95a1b5702 100644 --- a/translations/subsurface_de_CH.ts +++ b/translations/subsurface_de_CH.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -2320,17 +2320,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2354,7 +2354,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2577,13 +2577,13 @@ </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Speichern</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Abbrechen</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2717,32 +2717,32 @@ werden aus Luft und <translation>&Datei</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>pHe Kurve ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>Berechnung aller Gewebe ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>Auftauchgrenze Tauchcomputer ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Berechnete Auftauchgrenze ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>NDL, TTS ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Berechnete Auftauchgrenze in 3m Schritten ein-/ausschalten</translation> </message> @@ -2752,42 +2752,42 @@ werden aus Luft und <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation>pO₂ Kurve ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation>pN₂ Kurve ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Pulsrate ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>MOD ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>SAC Rate ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>Lineal ein-/ausschalten</translation> </message> @@ -2856,6 +2856,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Öffnen</translation> </message> @@ -3015,32 +3016,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> @@ -3205,80 +3206,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Abbrechen</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Zeige Laufzeit Tabelle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Jahresstatistiken</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that 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="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Möchtest Du die Änderungen in der Daten-Datei speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Datei speichern unter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Öffne Tauchlog Datei</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <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> @@ -3939,82 +3950,88 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>Primärer Tauchcomputer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Lösche diesen Tauchcomputer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Gaswechsel setzen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Markierung setzen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>Entferne Ereignis</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Ähnliche Ereignisse ausblenden</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Name bearbeiten</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Alle Ereignisse einblenden</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Ereignisse ausblenden</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Alle %1 Ereignisse ausblenden?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Ausgewähltes Ereignis entfernen?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Name der Markierung bearbeiten</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Benutzerdefinierter Name:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation>Name ist zu lang!</translation> </message> @@ -4125,12 +4142,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4157,12 +4174,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4394,7 +4411,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4730,12 +4747,12 @@ Prozessor Architektur (laut Betriebsystem): %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4896,15 +4913,15 @@ Mittel</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) oder (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>Luft</translation> </message> @@ -4934,27 +4951,63 @@ Mittel</translation> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Fehler beim Lesen von '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <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> @@ -4973,6 +5026,7 @@ Mittel</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -4986,6 +5040,7 @@ Mittel</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>Aufstieg</translation> @@ -5032,6 +5087,7 @@ Mittel</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5118,107 +5174,107 @@ Mittel</translation> <translation>ungültige Ereignisnummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Fehler beim Registrieren der Daten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Fehler beim Lesen des Datums</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Tauchgang %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Fehler beim Lesen der Dauer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Fehler beim Lesen der maximalen Tiefe</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation>Fehler beim Lesen der Gasgemischszahl</translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Fehler beim Lesen des Salzgehalts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Kein Oberflächendruck erhalten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Fehler beim Lesen der Gasgemischs</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Fehler beim Lesen der Samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Ereignis: warte auf Benutzeraktion</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Fehler beim Registrieren der Ereignisbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Fehler beim Importieren der Tauchgangsdaten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Fehler beim Öffnen von %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5236,7 +5292,7 @@ Mittel</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Datenbank Anfrage 'get_events' fehlgeschlagen. @@ -5244,51 +5300,51 @@ Mittel</translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>Datenbank Anfrage 'get_tags' fehlgeschlagen. </translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Datenbank Verbindung fehlgeschlagen '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Datenbank Anfrage fehlgeschlagen '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation>Datenbank Anfrage 'get_cylinders' fehlgeschlagen. </translation> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation>Datenbank Anfrage 'get_changes' fehlgeschlagen. </translation> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation>Datenbank Anfrage 'get_profile_sample' fehlgeschlagen. </translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Kann Stylesheet %s nicht öffnen</translation> </message> @@ -5298,7 +5354,7 @@ Mittel</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>Kann Gas %s nicht finden</translation> </message> @@ -5343,56 +5399,76 @@ Mittel</translation> <translation>Gas</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Aufstieg nach %.*f %s in %d:%02d min - Laufzeit %d:%02u mit %s</translation> </message> <message> - <location filename="../planner.c" line="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Beib auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s</translation> </message> <message> - <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Gaswechsel zu %s</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Gasverbrauch:</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Warnung:</translation> </message> @@ -5402,37 +5478,37 @@ Mittel</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>Dies ist mehr Gas, als in der Flasche verfügbar ist!</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Keine ausreichende Reserver für Aufstieg unter Wechselatmung!</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s während geplantem Aufstieg)</translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s während des geplanten Aufstiegs) von %s</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>hoher pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5441,70 +5517,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5513,7 +5589,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5522,142 +5598,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Sicherheitsstop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Sicherheitsstop: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>In Deko </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>Deko (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Berechneter tiefster Deko-Stopp %.0f %s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Gewebe %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>Herzschlag: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>Peilung: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sTiefe:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sTiefe:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sDruck:%d %s</translation> </message> diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts index 9f2f618a5..946a8a47c 100644 --- a/translations/subsurface_de_DE.ts +++ b/translations/subsurface_de_DE.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation>Keine Tauchpartner</translation> </message> @@ -2322,17 +2322,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation>Firmware-Aktualisierung fehlgeschlagen!</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation> </message> @@ -2356,7 +2356,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation>Kein Ort festgelegt</translation> </message> @@ -2579,13 +2579,13 @@ </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Speichern</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Abbrechen</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2719,32 +2719,32 @@ den folgenden Gasen gemischt werden: <translation>&Datei</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>pHe-Kurve ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>Berechnung aller Gewebe ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>Auftauchgrenze Tauchcomputer ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Berechnete Auftauchgrenze ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>Nullzeit, Gesamtaufstiegszeit ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Berechnete Auftauchgrenze in 3m Schritten ein-/ausschalten</translation> </message> @@ -2754,42 +2754,42 @@ den folgenden Gasen gemischt werden: <translation>&Tauchcomputer konfigurieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation>Tauchgang erneut planen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation>pO₂-Kurve ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation>pN₂-Kurve ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Pulsrate ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>MOD ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>AMV-Rate ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>Lineal ein-/ausschalten</translation> </message> @@ -2858,6 +2858,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Öffnen</translation> </message> @@ -3017,32 +3018,32 @@ p, li { white-space: pre-wrap; } <translation>Strg+Umschalt+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation>Maßstabsgraph</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation>Bilder umschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation>Tankleiste umschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation>Liste der Tauchgänge filtern</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation>Gewebe-Sättigungskurve ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation>Strg+F</translation> </message> @@ -3207,80 +3208,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Abbrechen</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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 die Datei geschlossen wird.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Laufzeittabelle anzeigen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Jahresstatistiken</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that 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="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Möchtest Sie Ihre Änderungen in der Datendatei speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Datei speichern unter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Tauchprotokolldatei öffnen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation>Tauchprotokolldateien (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran-Dateien (*.can);;CSV-Dateien (*.csv);;DiveLog.de-Dateien (*.dld);;JDiveLog-Dateien (*.jlb);;Liquivision-Dateien (*.lvd);;MkVI files (*.txt);;Suunto-Dateien (*.sde *.db);;UDDF/UDCF-Dateien (*.uddf *.udcf);;XML-Dateien (*.xml);;Alle Dateien (*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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 eine neue Datei geöffnet wird.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Bitte zuerst die aktuelle Bearbeitung abschließen um eine neue zu beginnen.</translation> </message> @@ -3941,82 +3952,88 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>Primärer Tauchcomputer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Lösche diesen Tauchcomputer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Gaswechsel setzen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation> (Tank %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Markierung setzen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>Entferne Ereignis</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Ähnliche Ereignisse ausblenden</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Name bearbeiten</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Alle Ereignisse einblenden</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Ereignisse ausblenden</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Alle %1 Ereignisse ausblenden?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Ausgewähltes Ereignis entfernen?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Name der Markierung bearbeiten</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Benutzerdefinierter Name:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation>Der Name ist zu lang!</translation> </message> @@ -4127,12 +4144,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation> </message> @@ -4159,12 +4176,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation> </message> @@ -4396,7 +4413,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation>Leere Stichwörter</translation> </message> @@ -4735,12 +4752,12 @@ Prozessor Architektur (laut Betriebsystem): %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation> </message> @@ -4901,15 +4918,15 @@ Durchschnitt</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) oder (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>Luft</translation> </message> @@ -4939,27 +4956,63 @@ Durchschnitt</translation> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Fehler beim Lesen von '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Poseidon-Import fehlgeschlagen: kann '%s' nicht lesen</translation> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation>Kein zugehöriger Tauchcomputer für die Datei '%s' gefunden</translation> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <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> @@ -4978,6 +5031,7 @@ Durchschnitt</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation>Batterie</translation> </message> @@ -4991,6 +5045,7 @@ Durchschnitt</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>Aufstieg</translation> @@ -5037,6 +5092,7 @@ Durchschnitt</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5123,107 +5179,107 @@ Durchschnitt</translation> <translation>ungültige Ereignisnummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Fehler beim Registrieren der Daten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Fehler beim Lesen des Datums</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Tauchgang %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Fehler beim Lesen der Dauer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Fehler beim Lesen der maximalen Tiefe</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation>Fehler beim Lesen der Temperatur</translation> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation>Fehler beim Lesen der Gasgemischszahl</translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Fehler beim Lesen des Salzgehalts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Kein Oberflächendruck erhalten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation>Fehler beim Auslesen des Modus des Tauchcomputers</translation> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Fehler beim Lesen des Gasgemischs</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Fehler beim Lesen der Samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Ereignis: warte auf Benutzeraktion</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Fehler beim Registrieren der Ereignisbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Fehler beim Importieren der Tauchgangsdaten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Fehler beim Öffnen von %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Unzureichende Privilegien zum Öffnen von Gerät %s %s (%s)</translation> </message> @@ -5241,7 +5297,7 @@ Durchschnitt</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Datenbank Anfrage 'get_events' fehlgeschlagen. @@ -5249,51 +5305,51 @@ Durchschnitt</translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>Datenbank Anfrage 'get_tags' fehlgeschlagen. </translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Datenbank Verbindung fehlgeschlagen '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Datenbank Anfrage fehlgeschlagen '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation>Datenbank Anfrage 'get_cylinders' fehlgeschlagen. </translation> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation>Datenbank Anfrage 'get_changes' fehlgeschlagen. </translation> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation>Datenbank Anfrage 'get_profile_sample' fehlgeschlagen. </translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Kann Stylesheet %s nicht öffnen</translation> </message> @@ -5303,7 +5359,7 @@ Durchschnitt</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>Kann Gas %s nicht finden</translation> </message> @@ -5348,56 +5404,76 @@ Durchschnitt</translation> <translation>Gas</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Aufstieg auf %.*f %s in %d:%02d min - Laufzeit %d:%02u mit %s</translation> </message> <message> - <location filename="../planner.c" line="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <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="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Gaswechsel zu %s</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>CND</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gasverbrauch (ohne CCR Segmente):</translation> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Gasverbrauch:</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Warnung:</translation> </message> @@ -5407,37 +5483,37 @@ Durchschnitt</translation> <translation>HAFTUNGSAUSSCHLUSS / WARNUNG: DIES IST EINE NEUE IMPLEMENTATION DES BÜHLMANN-ALGORITHMUS UND EINES DARAUF BASIERENDEN TAUCHPLANERS, DIE NUR EINGESCHRÄNKT GETESTET WURDE. WIR RATEN DRINGENST, KEINE TAUCHGÄNGE DURCHZUFÜHREN, DIE NUR AUF DEN HIER ERSTELLTEN DATEN BERUHEN.</translation> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>Dies ist mehr Gas, als in der Flasche verfügbar ist!</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Keine ausreichende Reserve für Aufstieg unter Wechselatmung!</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s während geplantem Aufstieg)</translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s während des geplanten Aufstiegs) von %s</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>hoher pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5446,70 +5522,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>AMV: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5518,7 +5594,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5527,142 +5603,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Sicherheitsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Sicherheitsstopp: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>In Deko </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>Nullzeit: %umin </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>Gesamtaufstiegszeit: %umin </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>Deko (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>Nullzeit: %umin (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>Gesamtaufstiegszeit: %umin (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Berechneter tiefster Deko-Stopp %.0f %s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Gewebe %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>Herzschlag: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>Peilung: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sTiefe:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sTiefe:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sDruck:%d %s</translation> </message> diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts index 5f1199ec5..155dff719 100644 --- a/translations/subsurface_el_GR.ts +++ b/translations/subsurface_el_GR.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -2321,17 +2321,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2355,7 +2355,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2578,13 +2578,13 @@ </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Αποθήκευση</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Ακύρωση</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2716,32 +2716,32 @@ mixed from Air and using: <translation>&File</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> @@ -2751,42 +2751,42 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> @@ -2851,6 +2851,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Άνοιγμα</translation> </message> @@ -3010,32 +3011,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> @@ -3200,80 +3201,90 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Ακύρωση</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <source>Changes will be lost if you don't save them.</source> <translation>Οι αλλαγές θα χαθούν αν δεν τις αποθηκεύσετε.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Προειδοποίηση</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3934,82 +3945,88 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Απόκρυψη παρόμοιων συμβάντων</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Απόκρυψη όλων των συμβάντων</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Απόκρυψη όλων των συμβάντων</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Απόκρυψη όλων των %1 συμβάντων;</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Διαγραφή του επιλεγμένου συμβάντος;</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4120,12 +4137,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4152,12 +4169,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4389,7 +4406,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4724,12 +4741,12 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4890,15 +4907,15 @@ SAC (%1)</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) ή (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>αέρας</translation> </message> @@ -4928,27 +4945,63 @@ SAC (%1)</translation> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Αποτυχία ανάγνωσης '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Μέγιστο αριθμός υποστηριζόμενων στηλών στην εισαγωγή CSV είναι %d</translation> </message> @@ -4967,6 +5020,7 @@ SAC (%1)</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -4980,6 +5034,7 @@ SAC (%1)</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>άνοδος</translation> @@ -5026,6 +5081,7 @@ SAC (%1)</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5112,107 +5168,107 @@ SAC (%1)</translation> <translation>άκυρος αριθμός συμβάντος</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <source>Unable to create parser for %s %s</source> <translation>Αδύνατον να αναλυθεί το %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Σφάλμα στην καταχώρηση των δεδομένων</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Σφάλμα στην ημερομηνία</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Κατάδυση %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Σφάλμα στην διάρκεια της κατάδυσης</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Σφάλμα στο μέγιστο βάθος</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation>Σφάλμα στον αριθμό των αερίων</translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Σφάλμα στην απόκτηση της αλμυρότητας</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Σφάλμα στην απόκτηση της ατμοσφαιρικής πίεσης</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Σφάλμα στο μίγμα αερίων</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Σφάλμα στα δείγματα</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Συμβάν: Περιμένοντας για ενέργεια από τον χρήστη</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Σφάλμα στην καταχώρηση του συμβάντος</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Σφάλμα στην καταχώρηση της ακύρωσης</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Σφάλμα στην εισαγωγή δεδομένων</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Αδύνατον να ανοιχθεί το %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5230,7 +5286,7 @@ SAC (%1)</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Σφάλμα στο ερώτημα get_events της βάσης δεδομένων @@ -5238,47 +5294,47 @@ SAC (%1)</translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Σφάλμα στην επικοινωνία με την βάση δεδομένων '%s' </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Σφάλμα στο ερώτημα της βάσης δεδομένων '%s' </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Αδύνατο το άνοιγμα του stylesheet %s</translation> </message> @@ -5288,7 +5344,7 @@ SAC (%1)</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> @@ -5333,56 +5389,76 @@ SAC (%1)</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <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="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <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="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -5392,232 +5468,232 @@ SAC (%1)</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index 084715ab4..d740d9470 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation>No buddies</translation> </message> @@ -2323,17 +2323,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>This feature is not yet available for the selected dive computer.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation>Firmware update failed.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation>Could not a establish connection to the dive computer.</translation> </message> @@ -2357,7 +2357,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation>No location set</translation> </message> @@ -2580,13 +2580,13 @@ </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Save</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Cancel</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2645,47 +2645,47 @@ <message> <location filename="../qt-ui/maintab.cpp" line="556"/> <source>Highest total SAC of a dive</source> - <translation type="unfinished"/> + <translation>Highest total SAC of a dive</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="557"/> <source>Lowest total SAC of a dive</source> - <translation type="unfinished"/> + <translation>Lowest total SAC of a dive</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="558"/> <source>Average total SAC of all selected dives</source> - <translation type="unfinished"/> + <translation>Average total SAC of all selected dives</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Highest temperature</source> - <translation type="unfinished"/> + <translation>Highest temperature</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Lowest temperature</source> - <translation type="unfinished"/> + <translation>Lowest temperature</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="571"/> <source>Average temperature of all selected dives</source> - <translation type="unfinished"/> + <translation>Average temperature of all selected dives</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Longest dive</source> - <translation type="unfinished"/> + <translation>Longest dive</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Shortest dive</source> - <translation type="unfinished"/> + <translation>Shortest dive</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average length of all selected dives</source> - <translation type="unfinished"/> + <translation>Average length of all selected dives</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="607"/> @@ -2720,32 +2720,32 @@ mixed from Air and using: <translation>&File</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>Toggle pHe graph</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>Toggle calculating all tissues</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>Toggle DC reported ceiling</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Toggle calculated ceiling</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>Toggle NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Toggle calculated ceiling with 3m increments</translation> </message> @@ -2755,42 +2755,42 @@ mixed from Air and using: <translation>Configure &dive computer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation>Re-plan &dive</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation>Toggle pO2 Graph</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation>Toggle pN2 Graph</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Toggle heart rate</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>Toggle MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>Toggle EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>Toggle SAC rate</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>Toggle ruler</translation> </message> @@ -2859,6 +2859,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Open</translation> </message> @@ -3018,32 +3019,32 @@ p, li { white-space: pre-wrap; } <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation>Scale graph</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation>Toggle pictures</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation>Toggle tank bar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation>&Filter divelist</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation>Toggle tissue graph</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> @@ -3208,80 +3209,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Open file</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Cancel</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Please save or cancel the current dive edit before closing the file.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Please save or cancel the current dive edit before trying to add a dive.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Print runtime table</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Yearly Statistics</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Do you want to save the changes that you made in the file %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Do you want to save the changes that you made in the data file?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Save changes?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Save file as</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Open dive log file</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <source>Changes will be lost if you don't save them.</source> <translation>Changes will be lost if you don't save them.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Warning</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Please save or cancel the current dive edit before opening a new file.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Please, first finish the current edition before trying to do another.</translation> </message> @@ -3942,82 +3953,88 @@ p, li { white-space: pre-wrap; } <translation>Show NDL / TTS was disabled because of excessive processing time</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>Make first dive computer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Delete this dive computer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Add gas change</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation> (Tank %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Add bookmark</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>Remove event</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Hide similar events</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Edit name</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Unhide all events</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Hide events</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Hide all %1 events?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Remove the selected event?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Edit name of bookmark</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Custom name:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation>Name is too long!</translation> </message> @@ -4032,7 +4049,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/diveplanner.cpp" line="39"/> <source>OXYGEN</source> - <translation type="unfinished"/> + <translation>OXYGEN</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="224"/> @@ -4128,12 +4145,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>This feature is not yet available for the selected dive computer.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation>Could not a establish connection to the dive computer.</translation> </message> @@ -4160,12 +4177,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>This feature is not yet available for the selected dive computer.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation>Could not a establish connection to the dive computer.</translation> </message> @@ -4397,7 +4414,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation>Empty Tags</translation> </message> @@ -4736,12 +4753,12 @@ OS CPU Architecture: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>This feature is not yet available for the selected dive computer.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation>Could not a establish connection to the dive computer.</translation> </message> @@ -4902,15 +4919,15 @@ Maximum</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) or (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>air</translation> </message> @@ -4940,27 +4957,63 @@ Maximum</translation> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Failed to read '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Poseidon import failed: unable to read '%s'</translation> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation>No matching DC found for file '%s'</translation> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maximum number of supported columns on CSV import is %d</translation> </message> @@ -4979,6 +5032,7 @@ Maximum</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation>battery</translation> </message> @@ -4992,6 +5046,7 @@ Maximum</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>ascent</translation> @@ -5038,6 +5093,7 @@ Maximum</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5124,107 +5180,107 @@ Maximum</translation> <translation>invalid event number</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <source>Unable to create parser for %s %s</source> <translation>Unable to create parser for %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Error registering data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Error parsing the date/time</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Dive %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Error parsing the divetime</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Error parsing the maxdepth</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation>Error parsing temperature</translation> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation>Error parsing the gas mix count</translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Error obtaining water salinity</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Error obtaining surface pressure</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation>Error obtaining divemode</translation> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Error parsing the gas mix</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Error parsing the samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Event: waiting for user action</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Error registering the event handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Error registering the cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Dive data import error</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Unable to open %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Insufficient privileges to open the device %s %s (%s)</translation> </message> @@ -5242,7 +5298,7 @@ Maximum</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Database query get_events failed. @@ -5250,51 +5306,51 @@ Maximum</translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>Database query get_tags failed. </translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Database connection failed '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Database query failed '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation>Database query get_cylinders failed. </translation> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation>Database query get_changes failed. </translation> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation>Database query get_profile_sample failed. </translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Can't open stylesheet %s</translation> </message> @@ -5304,7 +5360,7 @@ Maximum</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>Can't find gas %s</translation> </message> @@ -5349,56 +5405,76 @@ Maximum</translation> <translation>gas</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <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="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <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="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Switch gas to %s</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gas consumption (CCR legs excluded):</translation> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Gas consumption:</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Warning:</translation> </message> @@ -5408,37 +5484,37 @@ Maximum</translation> <translation>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</translation> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>this is more gas than available in the specified cylinder!</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>not enough reserve for gas sharing on ascent!</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s during planned ascent) of %s</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5447,70 +5523,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5519,7 +5595,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5528,142 +5604,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Safety Stop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Safety Stop: unkn time @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: unkn time @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>In deco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Calculated ceiling %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tissue %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>heartbeat: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>bearing: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts index edf3111b7..c1f8f238f 100644 --- a/translations/subsurface_es_ES.ts +++ b/translations/subsurface_es_ES.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation>Sin compañeros</translation> </message> @@ -2324,17 +2324,17 @@ el ordenador de buceo seleccionado?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Esta función no está disponible, todavía, para el ordenador seleccionado</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation>¡ Ha fallado la actualización de firmware !</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation>No se pudo establecer conexión con el ordenador de buceo.</translation> </message> @@ -2358,7 +2358,7 @@ el ordenador de buceo seleccionado?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation>Sin localización</translation> </message> @@ -2581,13 +2581,13 @@ el ordenador de buceo seleccionado?</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Guardar</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Cancelar</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2721,32 +2721,32 @@ a partir de aire y usando: <translation>Archivo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>Activar el gráfico de pHe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>Activar cálculo de todos los tejidos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>Activar techo informado por el ordenador</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Activar techo calculado</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>Activar LND, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Activar techo calculado con incrementos de 3m</translation> </message> @@ -2756,42 +2756,42 @@ a partir de aire y usando: <translation>Configurar or&denador de buceo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation>Re-planificar inmersión</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation>Activar el gráfico de pO2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation>Activar el gráfico de pN2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Activar ritmo cardiaco</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>Activar PMO</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>Activar PEA, PNE y EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>Activar tasa de CAS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>Activar regla</translation> </message> @@ -2860,6 +2860,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Abrir</translation> </message> @@ -3019,32 +3020,32 @@ p, li { white-space: pre-wrap; } <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation>Escalar gráfico</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation>Activar fotografías</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation>Activar barra de la botella</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation>&Filtrar la lista de inmersiones</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation>Activar el gráfico de tejidos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> @@ -3209,80 +3210,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Abrir archivo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Cancelar</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Imprimir tabla de tiempo de ejecución</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Estadísticas anuales</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>¿Quieres guardar los cambios realizados en el archivo %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>¿Quieres guardar los cambios que has hecho en el archivo de datos?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>¿Guardar cambios?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Guardar archivo como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Abrir archivo de registro de inmersiones</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation>Archivos de divelog (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Archivos de Cochran (*.can);;Archivos CSV (*.csv);;Archivos de divelogs.de (*.dld);;Archivos de JDiveLog (*.jlb);;Archivos de Liquivision (*.lvd);;Archivos de MkVI (*.txt);;Archivos de Suunto (*.sde *.db);;Archivos UDDF/UDCF (*.uddf *.udcf);;Archivos XML (*.xml);;Todos los archivos (*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <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> @@ -3943,82 +3954,88 @@ p, li { white-space: pre-wrap; } <translation>Mostrar LND/TTS se ha desactivado por excesivo tiempo de proceso</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>Hacer que sea el ordenador de buceo pricipal</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Borrar este ordenador de buceo</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Añadir cambio de gas</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation>(Botella %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Añadir marca</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>Borrar evento</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Ocultar eventos similares</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Editar nombre</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Revelar todos los eventos</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Ocultar eventos</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>¿ Ocultar todos los eventos %1 ?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>¿ Borrar el evento seleccionado ?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Editar el nombre de la marca</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Nombre personalizado:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation>¡El nombre es demasiado largo!</translation> </message> @@ -4129,12 +4146,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Esta función no esta disponible, todavía, para el ordenador seleccionado.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation>No se pudo establecer conexión con el ordenador de buceo.</translation> </message> @@ -4161,12 +4178,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Esta función no está disponible, todavía, para el ordenador seleccionado.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation>No se pudo establecer conexión con el ordenador de buceo.</translation> </message> @@ -4398,7 +4415,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation>Sin etiquetas</translation> </message> @@ -4737,12 +4754,12 @@ Arquitectura del SO CPU : %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Esta función no está disponible, todavía, para el ordenador seleccionado.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation>No se pudo establecer conexión con el ordenador de buceo.</translation> </message> @@ -4903,15 +4920,15 @@ Media</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) o (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>aire</translation> </message> @@ -4941,27 +4958,63 @@ Media</translation> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>No se pudo leer «%s»</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Importación de Poseidon ha fallado: imposible leer '%s'</translation> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation>No se ha encontrado concordancia con ningún DC para el archivo '%s'</translation> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <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> @@ -4980,6 +5033,7 @@ Media</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation>batería</translation> </message> @@ -4993,6 +5047,7 @@ Media</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>ascenso</translation> @@ -5039,6 +5094,7 @@ Media</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5125,107 +5181,107 @@ Media</translation> <translation>el número de evento no es válido</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Error al registrar los datos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Error al analizar la fecha</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Inmersión n.º %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Error al analizar el tiempo de buceo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Error al analizar la máxima profundidad</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation>Error al leer la temperatura</translation> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <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="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Error al obtener salinidad del agua</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Error al obtener la presión en superficie</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation>Error al obtener el modo de buceo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Error al analizar la mezcla de gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Error al analizar las muestras</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Evento: esperando acción del usuario</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Error al registrar el manejador de eventos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Error al registrar el manejador de cancelación</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Error al importar datos de inmersiones</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>No es posible crear el contexto de libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>No se pudo abrir %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Privilegios insuficientes para abrir el dispositivo %s %s (%s)</translation> </message> @@ -5243,7 +5299,7 @@ Media</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Falló la petición get_events a la base de datos. @@ -5251,51 +5307,51 @@ Media</translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <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="170"/> + <location filename="../file.c" line="173"/> <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="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <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="2273"/> + <location filename="../parse-xml.c" line="2272"/> <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="2280"/> + <location filename="../parse-xml.c" line="2279"/> <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="2287"/> + <location filename="../parse-xml.c" line="2286"/> <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="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>No se puede abrir la hoja de estilo %s</translation> </message> @@ -5305,7 +5361,7 @@ Media</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>No puedo encontrar el gas %s</translation> </message> @@ -5350,56 +5406,76 @@ Media</translation> <translation>Gas</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <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 - tiempo de ejecución %d:%02u con %s</translation> </message> <message> - <location filename="../planner.c" line="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Permanecer a %.*f %s durante %d:%02d min - tiempo de ejecución %d:%02u con %s</translation> </message> <message> - <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Cambiar gas a %s</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Consumo de gas (excluidos segmentos con CCR)</translation> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Consumo de gas:</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Aviso:</translation> </message> @@ -5409,37 +5485,37 @@ Media</translation> <translation>DESCARGO DE RESPONSABILIDAD / AVISO: ESTA ES UNA NUEVA IMPLEMENTACIÓN DEL ALGORITMO BUHLMANN Y UNA IMPLEMENTACIÓN DE UN PLANIFICADOR DE INMERSIÓN BASADO EN ÉL QUE SOLO HA SIDO PROBADA DE FORMA LIMITADA. RECOMENDAMOS FIRMEMENTE NO PLANIFICAR INMERSIONES BASADAS SIMPLEMENTE EN LOS RESULTADOS QUE SE OBTENGAN AQUÍ.</translation> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>!Esto es más gas del disponible en la botella especificada¡</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>¡Reserva insuficiente para compartir gas durante el ascenso!</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s de %s (%.0f%s/%.0f%s en el ascenso planeado)</translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durante el ascenso planeado) of %s</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>Valor de pO₂ alto %.2f a %d:%02u con %s a la profundidad de %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5448,70 +5524,70 @@ Prof: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>Pres: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>CAS: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>PMO: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5520,7 +5596,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5529,142 +5605,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Parada de seguridad: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Parada de seguridad: tiempo desc @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Parada deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Parada deco: tiempo desc @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>En deco </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Parada deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>En deco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Techo calculado %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tejido %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>Ritmo cardiaco: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>Soporte: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sProf:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sProf:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sPres:%d %s</translation> </message> diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts index e44e8e8cb..66e8e43bd 100644 --- a/translations/subsurface_et_EE.ts +++ b/translations/subsurface_et_EE.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -2321,17 +2321,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2355,7 +2355,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2578,13 +2578,13 @@ </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Salvesta</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Loobu</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2717,32 +2717,32 @@ mixed from Air and using: <translation>&Fail</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>pHe graaf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>Kõik koed</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>Sukeldumiskompuutri poolt antud lagi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Arvutatud lagi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Arvutatud lagi 3m intervalliga</translation> </message> @@ -2752,42 +2752,42 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Südame pulss</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>SAC määr</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>Joonlaud</translation> </message> @@ -2856,6 +2856,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Ava</translation> </message> @@ -3015,32 +3016,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> @@ -3205,80 +3206,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Ava fail</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Loobu</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Väljasta jooksva aja tabel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Aasta statistika</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Kas soovid salvestada muudatused mis tegid faili %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Kas soovid salvestada muudatused mis tegid andmefaili?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Salvesta muudatused?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Salvesta nimega</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Ava sukeldumislogi fail</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Hoiatus</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Lõpeta praegune toimetamine enne järgmise alustamist.</translation> </message> @@ -3940,82 +3951,88 @@ väärtused</translation> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>Loo esimene sukeldumiskompuuter</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Kustuta see sukeldumiskompuuter</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Lisa gaasivahetus</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Lisa järjehoidja</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>Eemalda sündmus</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Peida sarnased sündmused</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Toimeta nimi</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Peida kõik sündmused</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Peida sündmused</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Peida kõik %1 sündmust?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Eemalda valitud sündmus?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Toimeta järjehoidja nimi</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Kohandatud nimi</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation>Nimi on liiga pikk!</translation> </message> @@ -4126,12 +4143,12 @@ väärtused</translation> <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4158,12 +4175,12 @@ väärtused</translation> <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4395,7 +4412,7 @@ väärtused</translation> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4734,12 +4751,12 @@ OS CPU Arhidektuur: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4900,15 +4917,15 @@ Max</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) või (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>õhk</translation> </message> @@ -4938,27 +4955,63 @@ Max</translation> <translation>külgeriputatav</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>'%s' lugemine ebaõnnestus</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>CSV impordil on max toetatud veergude arv %d</translation> </message> @@ -4977,6 +5030,7 @@ Max</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -4990,6 +5044,7 @@ Max</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>tõus</translation> @@ -5036,6 +5091,7 @@ Max</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5122,107 +5178,107 @@ Max</translation> <translation>vale sündmuse nr</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Viga andmete registreerimisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Viga kuupäeva ja aja tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Sukeldumine %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Viga põhjaaja tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Viga max sügavuse tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation>Viga gaasisegude arvu tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Viga vee soolsuse saamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Viga pinnarõhu saamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Viga gaasisegu tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Viga proovide tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Sündmus: ootan kasutaja sekkumist</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Viga sündmuste draiveri registreerimisel.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Viga tühistamise draiveri registreerimisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Viga sukeldumise andmete impordil</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Ei saa luua libdivecomputer konteksti</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Ei saa avada %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5240,7 +5296,7 @@ Max</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Andmebaasi päring get_events ebaõnnestus. @@ -5248,51 +5304,51 @@ Max</translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>Andmebaasi päring get_tags ebaõnnestus. </translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Andmebaasi ühendus ebaõnnestus '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Andmebaasi päring ebaõnnestus '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation>Andmebaasi päring get_cylinders ebaõnnestus. </translation> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation>Andmebaasi päring get_changes ebaõnnestus. </translation> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation>Andmebaasi päring get-profile_sample ebaõnnestus. </translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Ei suuda avada stiililehte &s</translation> </message> @@ -5302,7 +5358,7 @@ Max</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>Ei leia gaasi %s</translation> </message> @@ -5347,56 +5403,76 @@ Max</translation> <translation>gaas</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Üleminek %.*f %s-le %d:%02d min jooksul - jooksev aeg %d:%02u %s peal</translation> </message> <message> - <location filename="../planner.c" line="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <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 %s peal</translation> </message> <message> - <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Vaheta gaasiks %s</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Gaasi tarbimine:</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Hoiatus:</translation> </message> @@ -5406,37 +5482,37 @@ Max</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>gaasi hulk on suurem kui määratud balloonis võimalik!</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>pole piisavalt reservi gaasi jagamiseks tõusul!</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s %s-st (%.0f%s/%.0f%s planeeritud tõusul)</translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s planeeritud tõusu jooksul) %s-st</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>kõrge pO₂ väärtus %.2f %d:%02u peal gaasiga %s sügavusel %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5445,70 +5521,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5517,7 +5593,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5526,137 +5602,137 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Ohutuspeatus: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Ohutuspeatus: teadmata aeg @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: teadmata aeg @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>Dekos </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (arvutatud)</translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>Dekos (arvutatud) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (arvutatud)</translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (arvutatud)</translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Arvutatud lagi %.0f%s</translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Kude %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>Pulss: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>Kurss: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts index a5de2f53a..6a8715327 100644 --- a/translations/subsurface_fi_FI.ts +++ b/translations/subsurface_fi_FI.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation>Ei kavereita</translation> </message> @@ -962,7 +962,7 @@ <message> <location filename="../qt-ui/models.cpp" line="79"/> <source>Use</source> - <translation type="unfinished"/> + <translation>Käyttö</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="191"/> @@ -2307,33 +2307,33 @@ poistaa valitun sukellustietokoneen?</translation> <message> <location filename="../qt-ui/filterwidget.ui" line="73"/> <source>Reset filters</source> - <translation type="unfinished"/> + <translation>Nollaa suotimet</translation> </message> <message> <location filename="../qt-ui/filterwidget.ui" line="87"/> <source>Show/hide filters</source> - <translation type="unfinished"/> + <translation>Näytä/piilota suotimet</translation> </message> <message> <location filename="../qt-ui/filterwidget.ui" line="101"/> <source>Close and reset filters</source> - <translation type="unfinished"/> + <translation>Sulje ja nollaa suotimet</translation> </message> </context> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation>Laiteohjelmiston päivitys epäonnistui!</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation>Yhteys sukellustietokoneeseen epäonnistui.</translation> </message> @@ -2357,7 +2357,7 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation>Sijaintia ei asetettu</translation> </message> @@ -2580,13 +2580,13 @@ poistaa valitun sukellustietokoneen?</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Tallenna</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Peruuta</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2645,47 +2645,47 @@ poistaa valitun sukellustietokoneen?</translation> <message> <location filename="../qt-ui/maintab.cpp" line="556"/> <source>Highest total SAC of a dive</source> - <translation type="unfinished"/> + <translation>Korkein pintakulutus sukelluksella</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="557"/> <source>Lowest total SAC of a dive</source> - <translation type="unfinished"/> + <translation>Matalin pintakulutus sukelluksella</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="558"/> <source>Average total SAC of all selected dives</source> - <translation type="unfinished"/> + <translation>Keskimääräinen pintakulutus valituilla sukelluksilla</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Highest temperature</source> - <translation type="unfinished"/> + <translation>Korkein lämpötila</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Lowest temperature</source> - <translation type="unfinished"/> + <translation>Matalin lämpötila</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="571"/> <source>Average temperature of all selected dives</source> - <translation type="unfinished"/> + <translation>Valittujen sukellusten keskilämpötila</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Longest dive</source> - <translation type="unfinished"/> + <translation>Pisin sukellus</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Shortest dive</source> - <translation type="unfinished"/> + <translation>Lyhin sukellus</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average length of all selected dives</source> - <translation type="unfinished"/> + <translation>Valittujen sukellusten keskimääräinen kesto</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="607"/> @@ -2720,32 +2720,32 @@ sekoittaa ilmasta ja käyttäen: <translation>Tiedosto</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>Näytä/piilota pHe-kuvaaja</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>Näytä/piilota kaikkien kudosten laskenta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>Näytä/piilota sukellustietokoneen raportoima kattosyvyys</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Näytä/piilota laskettu kattosyvyys</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>Näytä/piilota NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Näytä/piilota laskettu kattosyvyys 3m:n tarkkuudella</translation> </message> @@ -2755,42 +2755,42 @@ sekoittaa ilmasta ja käyttäen: <translation>Ohjelmoi sukellustietokone</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation>Suunnittele sukellus uudestaan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation>Näytä/piilota pO2 -kaavio</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation>Näytä/piilota pN2 -kuvaaja</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Näytä/piilota syke</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>Näytä/piilota MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>Näytä/piilota EAD, END sekä EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>Näytä/piilota hengitysnopeus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>Näytä/piilota viivain</translation> </message> @@ -2859,6 +2859,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Avaa</translation> </message> @@ -3018,32 +3019,32 @@ p, li { white-space: pre-wrap; } <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation>Muuta kuvasuhdetta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation>Näytä/piilota kuvat</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation>Näytä/piilota säiliöpalkki</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation>Suodata sukelluslista</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation>Näytä/piilota kudoskuvaaja</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> @@ -3208,80 +3209,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Avaa tiedosto</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Peruuta</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Tulosta sukellussuunnitelma</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Vuositilastot</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Haluatko tallentaa muutoksesi tiedostoon %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Haluatko tallentaa muutoksesi tiedostoon?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Tallenna muutokset?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Tallenna nimellä</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Avaa sukellusloki</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation>Sukelluslokitiedostot (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran -tiedostot (*.can);;CSV -tiedostot (*.csv);;DiveLog.de -tiedostot (*.dld);;JDiveLog -tiedostot (*.jlb);;Liquivision -tiedosstot (*.lvd);;MkVI -tiedostot (*.txt);;Suunto -tiedostot (*.sde *.db);;UDDF/UDCF -tiedostot (*.uddf *.udcf);;XML -tiedostot (*.xml);;Kaikki tiedostot (*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Varoitus</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Ole hyvä ja lopeta nykyinen muokkaus ennen kuin aloitat uuden.</translation> </message> @@ -3291,7 +3302,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="609"/> <source>Filter shows %1 (of %2) dives</source> - <translation type="unfinished"/> + <translation>Suodin näyttää %1 (%2:sta) sukelluksesta</translation> </message> </context> <context> @@ -3943,82 +3954,88 @@ p, li { white-space: pre-wrap; } <translation>Suoranousu-/pintautumisaikaa ei näytetä, koska niiden laskemiseen kuluu liikaa aikaa</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>Aseta ensisijaiseksi sukellustietokoneeksi</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Poista tämä sukellustietokone</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Lisää kaasun vaihto</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation>(Säiliö %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Lisää kirjanmerkki</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>Poista tapahtuma</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Piilota samankaltaiset tapahtumat</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Muokkaa nimeä</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Näytä kaikki tapahtumat</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Piilota tapahtumat</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Piilota kaikki %1 tapahtumat</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Poistetaanko valitut tapahtumat?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Muokkaa kirjanmerkin nimeä</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Valinnainen nimi:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation>Nimi on liian pitkä!</translation> </message> @@ -4033,7 +4050,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/diveplanner.cpp" line="39"/> <source>OXYGEN</source> - <translation type="unfinished"/> + <translation>HAPPI</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="224"/> @@ -4129,12 +4146,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation>Yhteys sukellustietokoneeseen epäonnistui.</translation> </message> @@ -4161,12 +4178,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation>Yhteys sukellustietokoneeseen epäonnistui.</translation> </message> @@ -4398,7 +4415,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation>Tyhjennä avainsanat</translation> </message> @@ -4434,7 +4451,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/models.cpp" line="1090"/> <source> (%1 shown)</source> - <translation type="unfinished"/> + <translation> (näytetään %1)</translation> </message> </context> <context> @@ -4736,12 +4753,12 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation>Yhteys sukellustietokoneeseen epäonnistui.</translation> </message> @@ -4902,15 +4919,15 @@ Keski</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) tai (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>ilma</translation> </message> @@ -4940,27 +4957,63 @@ Keski</translation> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Tiedoston '%s' avaaminen epäonnistui</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Poseidon -tuonti epäonnistui: tiedoston '%2' luku epäonnistui</translation> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation>Vastaavaa sukellustietokonetta tiedostolle '%s' ei löytynyt</translation> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maksimimäärä sarakkeita CSV -tuonnissa on %d</translation> </message> @@ -4979,6 +5032,7 @@ Keski</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation>paristo</translation> </message> @@ -4992,6 +5046,7 @@ Keski</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>nousu</translation> @@ -5038,6 +5093,7 @@ Keski</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5124,107 +5180,107 @@ Keski</translation> <translation>tuntematon tapahtumanumero</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Virhe tiedon rekisteröinnissä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Virhe ajan jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Sukellus %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Virhe sukelluksen keston jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Virhe maksimisyvyyden jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation>Virhe lämpötilan jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <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="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Virhe veden suolapitoisuuden määrityksessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Virhe ilmanpaineen määrityksessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation>Virhe sukellustyypin lataamisessa</translation> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Virhe kaasuseoksen jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Virhe näytteiden tulkinnassa</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Tapahtuma: odotetaan käyttäjän toimia</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Virhe tapahtumakäsittelijän rekisteröinnissä.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Virhe perumiskäsittelijän rekisteröinnissä.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Virhe sukellusten jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>libdivecomputer-kontekstin luominen epäonnistui</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Avaaminen epäonnistui: %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Käyttövaltuudet eivät riitä laitteen %s %s (%s) avaamiseen</translation> </message> @@ -5242,7 +5298,7 @@ Keski</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Tietokantakysely 'get_events' (nouda tapahtumat) epäonnistui. @@ -5250,51 +5306,51 @@ Keski</translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>Tietokantakysely 'get_tags' epäonnistui. </translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Tietokantayhteys epäonnistui '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Tietokantakysely epäonnistui '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation>Tietokantakysely 'get_cylinders' epäonnistui. </translation> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation>Tietokantakysely 'get_changes' epäonnistui. </translation> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation>Tietokantakysely 'get_profile_sample' epäonnistui. </translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Tyylitiedoston %1 avaus ei onnistu</translation> </message> @@ -5304,7 +5360,7 @@ Keski</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>Seosta %s ei löydy</translation> </message> @@ -5349,58 +5405,78 @@ Keski</translation> <translation>kaasu</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Siirtymä %.*f %s ajassa %d:%02d min - sukellusaika %d:%02u on %s</translation> </message> <message> - <location filename="../planner.c" line="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Pysy %.*f %s:n syvyydessä %d:%02d min - sukellusaika %d:%02u %s:lla</translation> </message> <message> - <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3d min</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Vaihda kaasu seuraavaan: %s </translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>Happikertymä (CNS)</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>Happikertymä (OTU)</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Kaasun kulutus (CCR -etappeja ei mukana):</translation> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Kaasun kulutus: </translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Varoitus:</translation> </message> @@ -5410,37 +5486,37 @@ Keski</translation> <translation>VAROITUS: BUHLMANNIN ALGORITMIN TOTEUTUS JA SIIHEN PERUSTUVA SUKELLUSTEN SUUNNITTELUOMINAISUUS OVAT UUSIA, JOTEN NIITÄ ON TESTATTU VAIN RAJALLISESTI. SUKELLUKSIA SUUNNITELTAESSA EI TULE LUOTTAA VAIN NÄIHIN TULOKSIIN.</translation> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>tämä on enemmän kaasua kuin sinulla on määritellyissä säiliöissä!</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>sinulla ei ole tarpeeksi kaasua jakaaksesi sitä pintaan nousun ajan!</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s / %s (%.0f%s/%.0f%s suunnitellussa nousussa)</translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s suunnitellun nousun aikana) / %s</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>korkea pO₂ -arvo %.2f %d:%02u:ssa seoksella %s syvyydessä %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5449,70 +5525,70 @@ S: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>L: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>N: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5521,7 +5597,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5530,141 +5606,141 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Turvapysähdys: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Turvapysähdys: ajankohta? @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: ajankohta? @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>Dekossa</translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (lask.) </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>Dekossa (lask.) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Laskettu katto %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Kudos %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>syke: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>suunta: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sA: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sS:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sS:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sN:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sN:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5786,17 +5862,17 @@ EADD: %d%s <message> <location filename="../dive.c" line="30"/> <source>OC-gas</source> - <translation type="unfinished"/> + <translation>Vapaankierron seos</translation> </message> <message> <location filename="../dive.c" line="30"/> <source>diluent</source> - <translation type="unfinished"/> + <translation>diluent</translation> </message> <message> <location filename="../dive.c" line="30"/> <source>oxygen</source> - <translation type="unfinished"/> + <translation>happi</translation> </message> <message> <location filename="../dive.c" line="232"/> diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index 186b08da1..9f56bf432 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation>Pas d'équiper</translation> </message> @@ -36,7 +36,7 @@ <message> <location filename="../configuredivecomputer.cpp" line="567"/> <source>Setting successfully written to device</source> - <translation>Paramètre envoyés à l'ordinateur</translation> + <translation>Paramètre correctement envoyé à l'ordinateur</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="576"/> @@ -46,7 +46,7 @@ <message> <location filename="../configuredivecomputer.cpp" line="585"/> <source>Device settings successfully reset</source> - <translation>Paramètres de périphérique remis à zéro avec succès</translation> + <translation>Les paramètres du périphérique ont été remis à zéro avec succès</translation> </message> </context> <context> @@ -74,7 +74,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="67"/> <source>Save changes to device</source> - <translation>Enregistrer les modifications vers le périphérique</translation> + <translation>Enregistrer les modifications sur le périphérique</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="93"/> @@ -560,31 +560,31 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1021"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2227"/> <source>Dil 1</source> - <translation type="unfinished"/> + <translation>Dil 1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1026"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2232"/> <source>Dil 2</source> - <translation type="unfinished"/> + <translation>Dil 2</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1031"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2237"/> <source>Dil 3</source> - <translation type="unfinished"/> + <translation>Dil 3</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1036"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2242"/> <source>Dil 4</source> - <translation type="unfinished"/> + <translation>Dil 4</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1041"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2247"/> <source>Dil 5</source> - <translation type="unfinished"/> + <translation>Dil 5</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1086"/> @@ -602,29 +602,29 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1096"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2292"/> <source>SP 1</source> - <translation type="unfinished"/> + <translation>SP 1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1101"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2297"/> <source>SP 2</source> - <translation type="unfinished"/> + <translation>SP 2</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1106"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2302"/> <source>SP 3</source> - <translation type="unfinished"/> + <translation>SP 3</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1111"/> <source>SP 4</source> - <translation type="unfinished"/> + <translation>SP 4</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1116"/> <source>SP 5</source> - <translation type="unfinished"/> + <translation>SP 5</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1124"/> @@ -634,7 +634,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1148"/> <source>Fixed setpoint</source> - <translation type="unfinished"/> + <translation>Set Point fixe</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1153"/> @@ -644,7 +644,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1161"/> <source>Setpoint fallback</source> - <translation type="unfinished"/> + <translation>Set Point de secours</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1184"/> @@ -962,7 +962,7 @@ <message> <location filename="../qt-ui/models.cpp" line="79"/> <source>Use</source> - <translation type="unfinished"/> + <translation>Utilise</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="191"/> @@ -1186,7 +1186,7 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/models.cpp" line="1272"/> <source>SAC(%1)</source> - <translation>SAC(%1)</translation> + <translation>Consommation d'air(%1)</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1272"/> @@ -1369,7 +1369,7 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> <source>Image depths</source> - <translation type="unfinished"/> + <translation>Résolution d'image</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> @@ -1500,7 +1500,7 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Write depths of images to file.</source> - <translation type="unfinished"/> + <translation>Sauvegarder la résolution des images dans un fichier</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> @@ -1536,7 +1536,7 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> <source>Save image depths</source> - <translation type="unfinished"/> + <translation>Sauvegarder la résolution de l'image</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> @@ -1804,7 +1804,7 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> - <translation type="unfinished"/> + <translation>Enregistrer sous</translation> </message> </context> <context> @@ -1915,12 +1915,12 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="80"/> <source>Private dives will not appear in "related dives" lists, and will only be accessible if their URL is known.</source> - <translation type="unfinished"/> + <translation>Les plongées privées n’apparaissent pas dans la liste "plongée associées" et ne seront accessibles que par leur URL</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="83"/> <source>Keep dives private</source> - <translation type="unfinished"/> + <translation>Conserve les plongées privées</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="105"/> @@ -2004,7 +2004,7 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/models.cpp" line="1513"/> <source>SAC(%1)</source> - <translation>SAC(%1)</translation> + <translation>Consommation d'air(%1)</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1513"/> @@ -2308,35 +2308,35 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/filterwidget.ui" line="73"/> <source>Reset filters</source> - <translation type="unfinished"/> + <translation>Réinitialiser les filtres</translation> </message> <message> <location filename="../qt-ui/filterwidget.ui" line="87"/> <source>Show/hide filters</source> - <translation type="unfinished"/> + <translation>Afficher/cacher les filtres</translation> </message> <message> <location filename="../qt-ui/filterwidget.ui" line="101"/> <source>Close and reset filters</source> - <translation type="unfinished"/> + <translation>Fermer et réinitialiser les filtres</translation> </message> </context> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> - <translation type="unfinished"/> + <translation>Cette fonctionnalité n'est pas disponible pour l'ordinateur de plongé sélectionné</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation>La mise à jour du firmware à échoué</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> - <translation type="unfinished"/> + <translation>Impossible de se connecter à l'ordinateur de plongée</translation> </message> </context> <context> @@ -2358,9 +2358,9 @@ l'ordinateur de plongée sélectionné ?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> - <translation type="unfinished"/> + <translation>Lieux non défini</translation> </message> </context> <context> @@ -2480,12 +2480,12 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/maintab.ui" line="958"/> <source>Extra data</source> - <translation type="unfinished"/> + <translation>Donnée additionnelle</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="964"/> <source>Additional data from dive computer</source> - <translation type="unfinished"/> + <translation>Donnée additionnelle de l'ordinateur de plongée</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="305"/> @@ -2581,13 +2581,13 @@ l'ordinateur de plongée sélectionné ?</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Sauvegarder</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Annuler</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2646,47 +2646,47 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/maintab.cpp" line="556"/> <source>Highest total SAC of a dive</source> - <translation type="unfinished"/> + <translation>Consommation d'air maximale d'une plongée</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="557"/> <source>Lowest total SAC of a dive</source> - <translation type="unfinished"/> + <translation>Consommation d'air minimale d'une plongée</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="558"/> <source>Average total SAC of all selected dives</source> - <translation type="unfinished"/> + <translation>Consommation d'air moyenne des plongée séléctionées</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Highest temperature</source> - <translation type="unfinished"/> + <translation>Température maximale</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Lowest temperature</source> - <translation type="unfinished"/> + <translation>Température minimale</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="571"/> <source>Average temperature of all selected dives</source> - <translation type="unfinished"/> + <translation>Température moyenne des plongées sélectionnées</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Longest dive</source> - <translation type="unfinished"/> + <translation>Plongée la plus longue</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Shortest dive</source> - <translation type="unfinished"/> + <translation>Plongée la plus courte</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average length of all selected dives</source> - <translation type="unfinished"/> + <translation>Durée moyenne des plongées sélectionnées</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="607"/> @@ -2721,77 +2721,77 @@ mélangés à partir de l'air avec: <translation>&Fichier</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>Basculer l'affichage du graphique pHe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>activer la calcul de tout les compartiments</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>Afficher le plafond de l'ordinateur</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Afficher le plafond calculé</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>Afficher LND / DTR</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Afficher le plafond calculé avec un incrémente de 3m</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>Configure &dive computer</source> - <translation type="unfinished"/> + <translation>Configurer l'&ordinateur de plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> - <translation type="unfinished"/> + <translation>Replanifier la &plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> - <translation type="unfinished"/> + <translation>Basculer l'affichage du graphique pO2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> - <translation type="unfinished"/> + <translation>Basculer l'affichage du graphique pN2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Afficher le rythme cardiaque</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>Afficher la MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>Afficher PEA, PEEA, PEDA</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>Afficher la consommation d'air</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>afficher la règle</translation> </message> @@ -2860,6 +2860,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Ouvrir</translation> </message> @@ -2926,7 +2927,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="449"/> <source>&Copy dive components</source> - <translation type="unfinished"/> + <translation>&Copier les composants de la plongée</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="452"/> @@ -2936,7 +2937,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="457"/> <source>&Paste dive components</source> - <translation type="unfinished"/> + <translation>Coller les composants de la plongée</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="460"/> @@ -3019,32 +3020,32 @@ p, li { white-space: pre-wrap; } <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> - <translation type="unfinished"/> + <translation>Ajuster l’échelle </translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> - <translation type="unfinished"/> + <translation>Basculer l'affichage des images</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> - <translation type="unfinished"/> + <translation>Basculer l'affichage de la barre des bloc</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> - <translation type="unfinished"/> + <translation>&Filtrer la liste des plongées</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> - <translation type="unfinished"/> + <translation>Basculer l'affichage du graphique de saturation des compartiments</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> @@ -3209,80 +3210,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Ouvrir un fichier</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Annuler</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Imprimer le runtime</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Statistiques annuelles</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that 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="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Voulez-vous enregistrer les modifications du fichier de données ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Enregistrer les modifications?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Enregistrer le fichier sous</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Ouvrir un journal de plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"/> + <translation>Fichier Dive log (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Fichiers Cochran (*.can);;Fichiers CSV (*.csv);;Fichier DiveLog.de (*.dld);;Fichiers JDiveLog (*.jlb);;Liquivision files (*.lvd);;Fichiers MkVI (*.txt);;Fichiers Suunto (*.sde *.db);;Fichiers UDDF/UDCF (*.uddf *.udcf);;Fichiers XML (*.xml);;Tous les fichiers (*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Avertissement</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Merci de finir l'édition en cours avant d'en commencer une autre.</translation> </message> @@ -3292,7 +3303,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="609"/> <source>Filter shows %1 (of %2) dives</source> - <translation type="unfinished"/> + <translation>Le Filtre affiche %1 (de %2) plongées</translation> </message> </context> <context> @@ -3940,85 +3951,91 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> - <translation type="unfinished"/> + <translation>L'affichage de la LND/DTR est désactive à cause d'un temps de calcul excessif</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>Définir comme ordinateur de plongée principal</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Supprimer cet ordinateur de plongée</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Ajouter un changement de gaz</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> - <translation type="unfinished"/> + <translation> (Bloc %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Ajouter un signet</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>Supprimer l'événement</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Cacher les événements similaires</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Modifier le nom</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Dé-sélectionner tous les évènements</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Cacher les événements</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Cacher tous les événements %1 ?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Supprimer l'événement sélectionné ?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Modifier le nom du signet</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Nom personnalisé :</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation>Le nom est trop long !</translation> </message> @@ -4033,7 +4050,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/diveplanner.cpp" line="39"/> <source>OXYGEN</source> - <translation type="unfinished"/> + <translation>OXYGENE</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="224"/> @@ -4129,14 +4146,14 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> - <translation type="unfinished"/> + <translation>Cette fonctionnalité n'est pas disponible pour l'ordinateur de plongé sélectionné</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> - <translation type="unfinished"/> + <translation>Impossible de se connecter à l'ordinateur de plongée</translation> </message> </context> <context> @@ -4161,14 +4178,14 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> - <translation type="unfinished"/> + <translation>Cette fonctionnalité n'est pas disponible pour l'ordinateur de plongé sélectionné</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> - <translation type="unfinished"/> + <translation>Impossible de se connecter à l'ordinateur de plongée</translation> </message> </context> <context> @@ -4362,7 +4379,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="550"/> <source>Suits: </source> - <translation type="unfinished"/> + <translation>Combinaison</translation> </message> </context> <context> @@ -4370,7 +4387,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/filtermodels.cpp" line="119"/> <source>No suit set</source> - <translation type="unfinished"/> + <translation>Pas de combinaison définie</translation> </message> </context> <context> @@ -4398,7 +4415,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4477,12 +4494,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/updatemanager.cpp" line="69"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> - <translation type="unfinished"/> + <translation>La dernière version est %1, renseignez-vous auprès de votre vendeur pour d'éventuelles mises à jour.</translation> </message> <message> <location filename="../qt-ui/updatemanager.cpp" line="75"/> <source>Newest release version is </source> - <translation type="unfinished"/> + <translation>La version la plus récente est</translation> </message> <message> <location filename="../qt-ui/updatemanager.cpp" line="76"/> @@ -4714,7 +4731,7 @@ Architecture OS CPU: %1</translation> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/> <source>Transferring data...</source> - <translation type="unfinished"/> + <translation>Transfert des données en cours...</translation> </message> </context> <context> @@ -4738,14 +4755,14 @@ Architecture OS CPU: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> - <translation type="unfinished"/> + <translation>Cette fonctionnalité n'est pas disponible pour l'ordinateur de plongé sélectionné</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> - <translation type="unfinished"/> + <translation>Impossible de se connecter à l'ordinateur de plongée</translation> </message> </context> <context> @@ -4904,15 +4921,15 @@ Moyenne</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) ou (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>air</translation> </message> @@ -4942,27 +4959,63 @@ Moyenne</translation> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Impossible de lire « %s »</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Le nombre maximum de colonnes supporté pour les importations de fichiers CSV est %d.</translation> </message> @@ -4981,6 +5034,7 @@ Moyenne</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation>Batterie</translation> </message> @@ -4994,6 +5048,7 @@ Moyenne</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>ascension</translation> @@ -5040,6 +5095,7 @@ Moyenne</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5126,107 +5182,107 @@ Moyenne</translation> <translation>numéro d'événement non valide</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Impossible d'enregistrer les données</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Impossible d'analyser l'heure</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Plongée n°%d - %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Impossible d'analyser le temps de plongée</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Impossible d'analyser la profondeux maximale</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation>Impossible d'analyser la température</translation> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <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="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Impossible d'obtenir la salinité de l'eau</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Erreur à l'obtention de la pression en surface</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation>Erreur lors de l'obtention du mode de plongée</translation> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Impossible d'analyser le mélange gazeux</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Impossible d'analyser des échantillons</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <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="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Impossible d'enregistrer le gestionnaire d'événement.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Impossible d'enregistrer le gestionnaire d'annulation.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Erreur à l'import des données de plongées</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Impossible de créer un contexte libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Impossible d'ouvrir %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Privilèges insuffisants pour ouvrir le périphérique %s %s (%s)</translation> </message> @@ -5244,7 +5300,7 @@ Moyenne</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Échec de la requête get_events. @@ -5252,51 +5308,51 @@ Moyenne</translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>Échec de la requête get_tags. </translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Connexion à la base de données impossible '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Échec de la requête '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation>Échec de la requête get_cylinders. </translation> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation>Échec de la requête get_changes. </translation> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation>Échec de la requête get_profile_sample. </translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Impossible d'ouvrir le feuille de style %s</translation> </message> @@ -5306,7 +5362,7 @@ Moyenne</translation> <translation>Nitrox%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>Ne peut pas trouver le gaz %s</translation> </message> @@ -5351,96 +5407,116 @@ Moyenne</translation> <translation>gaz</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Transition de %.*f %s en %d:%02d min - runtime %d:%02u sur %s</translation> </message> <message> - <location filename="../planner.c" line="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Restez à %.*f %s durant %d:%02d min - runtime %d:%02u sur %s</translation> </message> <message> - <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Changer de gaz vers %s</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>SNC</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Consommation de gaz (segments CCR exclus) :</translation> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Consommation de gaz:</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Avertissement:</translation> </message> <message> <location filename="../planner.c" line="522"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> - <translation type="unfinished"/> + <translation>ATTENTION : CECI EST UNE NOUVELLE IMPLÉMENTATION DE L'ALGORITHME DE BÜHLMANN ET SON ADAPTATION DANS UN PLANIFICATEUR DE PLONGÉE QUI N'A ÉTÉ TESTÉ QUE SOMMAIREMENT. NOUS VOUS RECOMMANDONS FORTEMENT DE NE PAS PLANIFIER VOS PLONGÉES EN VOUS BASANT QUE SUR LES RÉSULTATS PROPOSÉS ICI.</translation> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>C'est plus de gaz que ce qui est disponible dans le bloc spécifié!</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>pas assez de gaz en réserve pour un échange lors de la remontée</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s de %s (%.0f%s/%.0f%s dans la remontée planifiée)</translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durant la remontée planifiée) de %s</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valeur pO₂ haute %.2f à %d:%02u avec le gaz %s à la profondeur %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5449,70 +5525,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>Consommation d'air en surface : %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>SNC : %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD : %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5521,7 +5597,7 @@ PEDA : %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5530,70 +5606,70 @@ PEDA : %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Arrêt de sécurité: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Arrêt de sécurité: temps inconnu @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Déco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Déco: temps inconnu @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>Déco </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>LND : %umin </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>DTR: %umin </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Déco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>Déco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>LND:%umin (calc) @@ -5601,72 +5677,72 @@ PEDA : %d%s </translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TRS:%umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Plafond calculé %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tissue %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>rythme cardiaque: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>palié: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sPd:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sPd:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5793,12 +5869,12 @@ PEDA : %d%s <message> <location filename="../dive.c" line="30"/> <source>diluent</source> - <translation type="unfinished"/> + <translation>diluant</translation> </message> <message> <location filename="../dive.c" line="30"/> <source>oxygen</source> - <translation type="unfinished"/> + <translation>oxygène</translation> </message> <message> <location filename="../dive.c" line="232"/> @@ -6360,7 +6436,7 @@ Est-ce que votre Uemis Zurich est branché correctement ?</translation> <message> <location filename="../save-html.c" line="486"/> <source>Average SAC</source> - <translation>SAC moyen</translation> + <translation>Consommation d'air moyene</translation> </message> <message> <location filename="../save-html.c" line="487"/> diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts index fbadadb20..f9b56e51e 100644 --- a/translations/subsurface_he.ts +++ b/translations/subsurface_he.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -2320,17 +2320,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2354,7 +2354,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2577,13 +2577,13 @@ </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>שמור</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>בטל</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2715,32 +2715,32 @@ mixed from Air and using: <translation>&קובץ</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> @@ -2750,42 +2750,42 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>צריכת אויר</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> @@ -2850,6 +2850,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>פתח</translation> </message> @@ -3009,32 +3010,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> @@ -3199,80 +3200,90 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>בטל</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <source>Changes will be lost if you don't save them.</source> <translation>כל השינויים יאבדו אם לא תשמרו אותם.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>אזהרה</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>קבצי XML נתמכים (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3933,82 +3944,88 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>הסתר אירועים דומים</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>חשוף את כל האירועים</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>הסתר אירועים</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>הסתר את כל %1 האירועים</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>הסר את האירוע שנבחרו?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4119,12 +4136,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4151,12 +4168,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4388,7 +4405,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4723,12 +4740,12 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4889,15 +4906,15 @@ Maximum</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%S) או (%S)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>אוויר</translation> </message> @@ -4927,27 +4944,63 @@ Maximum</source> <translation>נצמד</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>קריאה מ'%S' נכשלה</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -4966,6 +5019,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -4979,6 +5033,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>עליה</translation> @@ -5025,6 +5080,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5111,107 +5167,107 @@ Maximum</source> <translation>מס' ארוע שגוי</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <source>Unable to create parser for %s %s</source> <translation>לא מצליח להבין %s %s </translation> </message> <message> - <location filename="../libdivecomputer.c" line="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>שגיאה ברישום המידע</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>שגיאה בקריאת תאריך</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>שגיאה בקריאת זמן צלילה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>שגיאה בקריאת עומק מקסימלי</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation>שגיאה בקריאת תערובת גזים</translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>שגיאה בקבלת מליחות מים</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>שגיאה בקבלת לחץ על פני המים</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>שגיאה בקריאת תערובת הגזים</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>שגיאה בקריאת נקודות דגימה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>אירוע: מחכה לפעולה של המשתמש</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>שגיאה ברישום שגרת ניהול</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>שגיאת יבוא נתוני צלילה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>לא ניתן לפתוח את %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5228,7 +5284,7 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>שאילתת מסד נתונים של Get_events נכשל @@ -5236,47 +5292,47 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>החיבור למסד הנתונים נכשל '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>שאילתת מסד נתונים נכשל '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>לא ניתן לפתוח את גיליון העיצוב %s</translation> </message> @@ -5286,7 +5342,7 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> @@ -5331,56 +5387,76 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <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="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <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="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -5390,233 +5466,233 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>רעילות שייורית מקסימלית %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>פעימות לב %d</translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts index a2d826027..ca5fd3227 100644 --- a/translations/subsurface_hr_HR.ts +++ b/translations/subsurface_hr_HR.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -2319,17 +2319,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2353,7 +2353,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2576,12 +2576,12 @@ </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> + <source>Apply changes</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> + <source>Discard changes</source> <translation type="unfinished"/> </message> <message> @@ -2714,32 +2714,32 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> @@ -2749,42 +2749,42 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> @@ -2849,6 +2849,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation type="unfinished"/> </message> @@ -3008,32 +3009,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> @@ -3198,80 +3199,90 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Godišnje statistike</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3932,82 +3943,88 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4118,12 +4135,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4150,12 +4167,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4387,7 +4404,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4722,12 +4739,12 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4878,15 +4895,15 @@ Maximum</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) ili (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>zrak</translation> </message> @@ -4916,27 +4933,63 @@ Maximum</source> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Nije uspjelo čitanje '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -4955,6 +5008,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -4968,6 +5022,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>izron</translation> @@ -5014,6 +5069,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5100,107 +5156,107 @@ Maximum</source> <translation>neispravan broj događaja</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Greška pri registraciji podataka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Greška pri parsiranju datuma i vremena</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Greška pri parsiranju vremena urona</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Greška pri parsiranju maksimalne dubine</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation>Greška pri parsiranju broja mješavina</translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Greška pri dohvaćanju saliniteta vode</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Greška pri parsiranju mješavine plinova</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Greška pri parsiranju uzoraka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Događaj: čekanje na korisničku akciju</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Greška pri registraciji event handlera.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Greška pri registraciji cancellation handlera</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Greška pri uvozu podataka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Ne mogu kreirati libdivecomputer kontekst</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Nije uspjelo otvaranje %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5218,7 +5274,7 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Neuspjeo get_events na bazi. @@ -5226,47 +5282,47 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Neuspjelo spajanje na bazu '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Neuspjeo upit na bazu '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -5276,7 +5332,7 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> @@ -5321,56 +5377,76 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <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="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <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="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -5380,231 +5456,231 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts index c91a0a569..74041abc7 100644 --- a/translations/subsurface_hu.ts +++ b/translations/subsurface_hu.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -2319,17 +2319,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2353,7 +2353,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2576,12 +2576,12 @@ </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Ment</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> + <source>Discard changes</source> <translation type="unfinished"/> </message> <message> @@ -2714,32 +2714,32 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> @@ -2749,42 +2749,42 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> @@ -2849,6 +2849,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation type="unfinished"/> </message> @@ -3008,32 +3009,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> @@ -3198,80 +3199,90 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3932,82 +3943,88 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4118,12 +4135,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4150,12 +4167,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4387,7 +4404,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4722,12 +4739,12 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4878,15 +4895,15 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) vagy (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation type="unfinished"/> </message> @@ -4916,27 +4933,63 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>'%s' olvasása meghiúsult.</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -4955,6 +5008,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -4968,6 +5022,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation type="unfinished"/> @@ -5014,6 +5069,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5100,107 +5156,107 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Hiba az adat regisztrálása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Hiba a dátumidő feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Hiba a merülési idő feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Hiba a max mélység feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <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="513"/> + <location filename="../libdivecomputer.c" line="518"/> <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="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <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="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Hiba a minták feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <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="714"/> + <location filename="../libdivecomputer.c" line="720"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="774"/> + <location filename="../libdivecomputer.c" line="792"/> <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="779"/> + <location filename="../libdivecomputer.c" line="797"/> <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="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Merülési adat importálási hiba</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5217,52 +5273,52 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -5272,7 +5328,7 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> @@ -5317,56 +5373,76 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <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="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <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="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -5376,231 +5452,231 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts index 29cbfc493..a1c4b8f9e 100644 --- a/translations/subsurface_id.ts +++ b/translations/subsurface_id.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -2319,17 +2319,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2353,7 +2353,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2576,13 +2576,13 @@ </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Simpan</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Batal</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2714,32 +2714,32 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> @@ -2749,42 +2749,42 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> @@ -2849,6 +2849,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Buka</translation> </message> @@ -3008,32 +3009,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> @@ -3198,80 +3199,90 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Batal</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3932,82 +3943,88 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4118,12 +4135,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4150,12 +4167,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4387,7 +4404,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4722,12 +4739,12 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4886,15 +4903,15 @@ Rata-rata</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) or (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>udara</translation> </message> @@ -4924,27 +4941,63 @@ Rata-rata</translation> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Gagal baca '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -4963,6 +5016,7 @@ Rata-rata</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -4976,6 +5030,7 @@ Rata-rata</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>nai</translation> @@ -5022,6 +5077,7 @@ Rata-rata</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5108,107 +5164,107 @@ Rata-rata</translation> <translation>nomor kejadian tidak sesuai</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Gagal mendaftarkan data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Gagal mengurai tanggal</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Gagal mengurai waktu selam</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Gagal mengurai kedalamn maks</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation>Gagal mengurai perhitungan campuran gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5225,52 +5281,52 @@ Rata-rata</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -5280,7 +5336,7 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> @@ -5325,56 +5381,76 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <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="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <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="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -5384,231 +5460,231 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts index c77a1ff4d..10f8721ea 100644 --- a/translations/subsurface_it_IT.ts +++ b/translations/subsurface_it_IT.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation>Nessun compagno di immersione</translation> </message> @@ -2323,17 +2323,17 @@ il computer selezionato?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Questa funzionalità non è ancora disponibile per il computer selezionato.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation>Aggiornamento del firmware fallito!</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation>Non è stato possibile collegarsi al computer subacqueo.</translation> </message> @@ -2357,7 +2357,7 @@ il computer selezionato?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation>Nessun luogo impostato</translation> </message> @@ -2580,13 +2580,13 @@ il computer selezionato?</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Salva</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Annulla</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2720,32 +2720,32 @@ mixati con aria e usando: <translation>&File</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>Visualizza il grafico pHe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>Abilita il calcolo su tutti i tessuti</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>Visualizza il ceiling calcolato dal computer subacqueo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Visualizza il ceiling calcolato</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>Visualizza NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Mostra il ceiling calcolato con incrementi di 3m</translation> </message> @@ -2755,42 +2755,42 @@ mixati con aria e usando: <translation>Configura &Computer subacqueo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation>Ripianifica &immersione</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation>Mostra il grafico della pO₂</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation>Mostra il grafico della pN₂</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Visualizza il battito cardiaco</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>Visualizza la MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>Visualizza EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>Visualizza il CAS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>Mostra il righello</translation> </message> @@ -2859,6 +2859,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Apri</translation> </message> @@ -3018,32 +3019,32 @@ p, li { white-space: pre-wrap; } <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation>Scala grafico</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation>Scambia immagini</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation>Scambia bombole</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation>&Filtra la lista delle immersioni</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation>Attiva/disattiva il grafico dei tessuti</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> @@ -3208,80 +3209,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Apri file</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Annulla</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Stampa la tabella con il runtime</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Statistiche Annuali</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that 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="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vuoi salvare le modifiche fatte nel file di dati?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Salvo le modifiche?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Apri file come</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Apri file di log immersioni</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Avviso</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <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> @@ -3942,82 +3953,88 @@ p, li { white-space: pre-wrap; } <translation>La visualizzazione NDL / TTS è stata disabilitata perchè i calcoli richiedono troppo tempo</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>Rendilo computer principale</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Cancella questo computer subacqueo</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Aggiungi un cambio gas</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation>(Bombola %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Aggiungi un segnalibro</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>Rimuovi evento</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Nascondi eventi simili</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Modifica il nome</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Mostra tutti gli eventi</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Nascondi gli eventi</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Nascondi tutti gli eventi %1?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Rimuovere l'evento selezionato?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Modifica il nome del bookmark</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Nome personalizzato:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation>Il nome è troppo lungo</translation> </message> @@ -4128,12 +4145,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Questa funzionalità non è ancora disponibile per questo computer.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation>Non è stato possibile connettersi al computer subacqueo.</translation> </message> @@ -4160,12 +4177,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Questa funzionalità non è ancora disponibile per il computer selezionato.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation>Non è stato possibile connettersi al computer subacqueo.</translation> </message> @@ -4397,7 +4414,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation>Etichette vuote</translation> </message> @@ -4736,12 +4753,12 @@ OS Architettura CPU: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Questa funzionalità non è ancora disponibile per il computer selezionato.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation>Non è stato possibile connettersi al computer subacqueo.</translation> </message> @@ -4902,15 +4919,15 @@ Media</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) oder (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>aria</translation> </message> @@ -4940,27 +4957,63 @@ Media</translation> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Impossibile leggere '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Importazione dal Poseidon fallita: impossibile leggere '%s'</translation> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation>Nessun computer corrispondente per il file '%s'</translation> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <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> @@ -4979,6 +5032,7 @@ Media</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation>batteria</translation> </message> @@ -4992,6 +5046,7 @@ Media</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>risalita</translation> @@ -5038,6 +5093,7 @@ Media</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5124,107 +5180,107 @@ Media</translation> <translation>numero evento non valido</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Errore registrando la data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Errore analizzando la data/il tempo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Immersione #%d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Errore analizzando il tempo di immersione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Errore analizzando la profondità massima</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation>Errore analizzando la temperatura</translation> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <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="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Errore nell'ottenimento della salinità dell'acqua</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Errore nell'ottenere la pressione superficiale</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation>Errore nell'ottenere la modalità di immersione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Errore analizzando la miscela di gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Errore analizzando i campioni</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Evento: in attesa dell' azione dell'utente.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Errore registrando il gestore degli eventi.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Errore registrando il gestore della cancellazione.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Errore importazione dati immersione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Impossibile creare un contesto libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Impossibile aprire %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Privilegi insufficienti per aprire il dispositivo %s %s (%s)</translation> </message> @@ -5243,7 +5299,7 @@ Media</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Interrogazione get_events fallita. @@ -5251,44 +5307,44 @@ Media</translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>La query get_tags sul database non è riuscita. </translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Connessione al database fallita '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Interrogazione al database fallita '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <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="2280"/> + <location filename="../parse-xml.c" line="2279"/> <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="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation>La query get_profile_sample sul database non è riuscita. @@ -5296,7 +5352,7 @@ Media</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Non é possibile aprire il foglio di stile %s</translation> </message> @@ -5306,7 +5362,7 @@ Media</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>Non trovo il gas %s</translation> </message> @@ -5351,56 +5407,76 @@ Media</translation> <translation>gas</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Passaggio a %.*f %s al %d:%02d min - runtime %d:%02u con %s</translation> </message> <message> - <location filename="../planner.c" line="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Rimani a %.*f %s per %d:%02d min - runtime %d:%02u con %s</translation> </message> <message> - <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Passa al gas %s</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Consumo del gas (CCR legs escluse):</translation> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Consumo gas:</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Avviso</translation> </message> @@ -5410,37 +5486,37 @@ Media</translation> <translation>DISCLAIMER / AVVISO: QUESTA È UNA NUOVA IMPLEMENTAZIONE DELL'ALGORITMO DI BUHLMANN E DELL'IMPLEMENTAZIONE DEL PIANO DI IMMERSIONE BASATO SU CIÒ CHE HA RICEVUTO SOLO UNA LIMITATA QUANTITA' DI TEST. E' ALTAMENTE RACCOMANDATO DI NON PIANIFICARE IMMERSIONI BASATE SEMPLICEMENTE SUI RISULTATI DATI QUI.</translation> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>il gas necessario è superiore a quello disponibile nella bombola</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>riserva di gas non sufficiente per la condivisione in risalita</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s nella risalita pianificata)</translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durante la risalita pianificata) di %s</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5449,28 +5525,28 @@ D:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>P:%d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>CAS: %.*f%s/min @@ -5478,42 +5554,42 @@ D:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO₂%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN₂ %s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5522,7 +5598,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5531,141 +5607,141 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Sosta di sicurezza: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Sosta di sicurezza: </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: temo di sosta sconosciuto @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>In deco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>NDL:%umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Ceiling calcolato %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tessuto %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>Battito cardiaco: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>Direzione: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> diff --git a/translations/subsurface_lv_LV.ts b/translations/subsurface_lv_LV.ts index a96b1ae2f..f638b9d20 100644 --- a/translations/subsurface_lv_LV.ts +++ b/translations/subsurface_lv_LV.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -2321,17 +2321,17 @@ likvidēt izvēlētus datorus?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2355,7 +2355,7 @@ likvidēt izvēlētus datorus?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2578,13 +2578,13 @@ likvidēt izvēlētus datorus?</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Saglabāt</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Dzēst</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2716,32 +2716,32 @@ mixed from Air and using: <translation>&Fails</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>Pārslēgt pHe grafiku</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>Pārslēgt NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> @@ -2751,42 +2751,42 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Pārslēgt pulsu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>Pārslēgt MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>Pārslēgt EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> @@ -2855,6 +2855,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Atvērt</translation> </message> @@ -3014,32 +3015,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> @@ -3204,80 +3205,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Atvērt failu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Atcelt</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before closing the file.</source> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Izdrukāt niršanas tabulu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Gada statistika</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that 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="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vai velāties saglabāt izmaiņas datnes datu datnē?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Saglabāt izmaiņas?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Saglabāt kā</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Atvērt niršanas žurnālu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Brīdinājums</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Lūdzu, pabeidziet tekošo rediģēšanu pirms mēģinot citu.</translation> </message> @@ -3938,82 +3949,88 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>Padarīt niršanas datoru par pirmo</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Nodzēst šo niršanas datoru</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Pievienot gāzes maiņu</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Pievienot grāmatzīmi</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>Noņemt notikumu</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Paslēpt līdzīgus notikumus</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Rediģēt vārdu</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Parādīt visus notikumus</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Paslēpt notikumus</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Paslēpt visus %1 notikumus?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Nodzēst izvēlēto notikumu?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Rediģēt grāmatzīmes vārdu</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Vārds:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4124,12 +4141,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4156,12 +4173,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4393,7 +4410,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4732,12 +4749,12 @@ OS CPU Arhitektūra: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4898,15 +4915,15 @@ Vidējais</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) vai (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>gaiss</translation> </message> @@ -4936,27 +4953,63 @@ Vidējais</translation> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Neizdevas nolasīt '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maksimālais atbalstītais stabu skaits CSV importēšanai ir %d</translation> </message> @@ -4975,6 +5028,7 @@ Vidējais</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -4988,6 +5042,7 @@ Vidējais</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>stāvums</translation> @@ -5034,6 +5089,7 @@ Vidējais</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5120,107 +5176,107 @@ Vidējais</translation> <translation>kļūdains notikuma numurs</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <source>Unable to create parser for %s %s</source> <translation>Nav iespējams izveidot parsētāju priekš %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Kļūda reģistrējot datus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Kļūda parsējot laiku</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Kļūda parsējot niršanas laiku</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Kļūda parsējot maks. dziļumu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation>Kļūda parsējot gāzes maisījuma daudzumu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Kļūda ūdens sāļuma noteikšanā</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Kļūda spiediena noteikšanā uz virsmu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Kļūda parsējot gāzes maisījumu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Kļūda parsējot paraugus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Notikums: gaida lietotāja darbību</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>modelis=%u (0x%08x), aparātprogrammatūra=%u (0x%08x), serial numurs=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Kļūda reģistrējot notikumu apstrādātāju.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Error registering the cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Kļūda importējot niršanas datus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Nav iespējams izveidot libdivecomputer kontekstu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Nevar atvērt %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5238,7 +5294,7 @@ Vidējais</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Kļūme datubāzes vaicājumā get_events. @@ -5246,51 +5302,51 @@ Vidējais</translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>Neizdevas datubāzes pieprasījums get_tags. </translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Kļūme savienojoties ar datubāzi '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Kļūme vaicājot datubāzi '@s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation>Neizdevas datubāzes pieprasījums get_cylinders. </translation> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation>Neizdevas datubāzes pieprasījums get_changes. </translation> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation>Neizdevas datubāzes pieprasījums get_profile_sample. </translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Nevar atvērts stila lapu %s</translation> </message> @@ -5300,7 +5356,7 @@ Vidējais</translation> <translation>EAN</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>Nevar atrast gāzi %s</translation> </message> @@ -5345,56 +5401,76 @@ Vidējais</translation> <translation>gāze</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <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="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <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="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Pārslēgt gāzi uz %s</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Gāzes patēriņš:</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Brīdinājums:</translation> </message> @@ -5404,37 +5480,37 @@ Vidējais</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5443,70 +5519,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>S: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>L: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>Ā: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5515,7 +5591,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5524,49 +5600,49 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Drošības apstāšana: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Drošības apstāšana: nez. laiks @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Dekompr.: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Dekompr.: nez. laiks @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>Dekompresijā </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>TTS: %umin @@ -5575,93 +5651,93 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Dekompr.: %umin @ %.0f%s (izrēķ.) </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>Dekompresijā (izrēķ.) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (izrēķ.) </translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (izrēķ.) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Aprēķināta maks. dekompr. pietura %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Audu līmenis %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>sirdspuksti: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>azimuts: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index 61bc848ae..089103c13 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation>Ingen buddyer</translation> </message> @@ -251,34 +251,34 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="387"/> <source>Eco</source> - <translation type="unfinished"/> + <translation>Øko</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="392"/> <source>Medium</source> - <translation type="unfinished"/> + <translation>Medium</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="397"/> <source>High</source> - <translation type="unfinished"/> + <translation>Høy</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="522"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1792"/> <source>Sampling rate</source> - <translation type="unfinished"/> + <translation>Samplingsfrekvens</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="533"/> <source>2s</source> - <translation type="unfinished"/> + <translation>2s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="538"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1450"/> <source>10s</source> - <translation type="unfinished"/> + <translation>10s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="405"/> @@ -289,147 +289,147 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="416"/> <source>m/°C</source> - <translation type="unfinished"/> + <translation>m/°C</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="421"/> <source>ft/°F</source> - <translation type="unfinished"/> + <translation>ft/°F</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="546"/> <source>Dive mode color</source> - <translation type="unfinished"/> + <translation>Dykkemodusfarge</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/> <source>Standard</source> - <translation type="unfinished"/> + <translation>Standard</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/> <source>Red</source> - <translation type="unfinished"/> + <translation>Rød</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/> <source>Green</source> - <translation type="unfinished"/> + <translation>Grøn</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/> <source>Blue</source> - <translation type="unfinished"/> + <translation>Blå</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="429"/> <source>Salinity (0-5%)</source> - <translation type="unfinished"/> + <translation>Saltnivå (0-5%)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="580"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1726"/> <source>Sync dive computer time with PC</source> - <translation type="unfinished"/> + <translation>Synkroniser tid på dykkecomputer med PC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="449"/> <source>Compass gain</source> - <translation type="unfinished"/> + <translation>Kompassdeviasjon</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="64"/> <source>Read settings from backup file or from device before writing to the device</source> - <translation type="unfinished"/> + <translation>Les innstillinger fra sikkerhetskopi eller fra dykkecomputeren før det skrives til den</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="90"/> <source>Read settings from backup file or from device before writing to a backup file</source> - <translation type="unfinished"/> + <translation>Les innstillinger fra sikkerhetskopi eller fra dykkecomputeren før lagring til sikkerhetskopi</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> - <translation type="unfinished"/> + <translation>OSTC, Mk.2/2N/2C</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="466"/> <source>230LSB/Gauss</source> - <translation type="unfinished"/> + <translation>230LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="471"/> <source>330LSB/Gauss</source> - <translation type="unfinished"/> + <translation>330LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="476"/> <source>390LSB/Gauss</source> - <translation type="unfinished"/> + <translation>390LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="481"/> <source>440LSB/Gauss</source> - <translation type="unfinished"/> + <translation>440LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="486"/> <source>660LSB/Gauss</source> - <translation type="unfinished"/> + <translation>660LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="491"/> <source>820LSB/Gauss</source> - <translation type="unfinished"/> + <translation>820LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="496"/> <source>1090LSB/Gauss</source> - <translation type="unfinished"/> + <translation>1090LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="501"/> <source>1370LSB/Gauss</source> - <translation type="unfinished"/> + <translation>1370LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="587"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1733"/> <source>Show safety stop</source> - <translation type="unfinished"/> + <translation>Vis sikkerhetsstop</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="597"/> <source>Reset device to default settings</source> - <translation type="unfinished"/> + <translation>Resett dykkecomputer til standardinnstillinger</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="611"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1819"/> <source>Alt GF can be selected underwater</source> - <translation type="unfinished"/> + <translation>Alternativ GF kan velges under dykk</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> <source>Suunto Vyper family</source> - <translation type="unfinished"/> + <translation>Suunty Vyper-familien</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced settings</source> - <translation type="unfinished"/> + <translation>Avanserte innstillinger</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> - <translation type="unfinished"/> + <translation>Framtidig TTS</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="625"/> <source>Pressure sensor offset</source> - <translation type="unfinished"/> + <translation>Trykksensoravvik</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="632"/> @@ -447,52 +447,52 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="730"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1885"/> <source>Decotype</source> - <translation type="unfinished"/> + <translation>Dekotype</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="756"/> <source> mbar</source> - <translation type="unfinished"/> + <translation>mbar</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="769"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1892"/> <source> min</source> - <translation type="unfinished"/> + <translation>min</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="783"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1925"/> <source>ZH-L16</source> - <translation type="unfinished"/> + <translation>ZH-L16</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="788"/> <source>ZH-L16+GF</source> - <translation type="unfinished"/> + <translation>ZH-L16+GF</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="851"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1989"/> <source>Alt GFLow</source> - <translation type="unfinished"/> + <translation>Alt GF-Lav</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="858"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2015"/> <source>Alt GFHigh</source> - <translation type="unfinished"/> + <translation>Alt GF-Høy</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="865"/> <source>Flip screen</source> - <translation type="unfinished"/> + <translation>Flipp skjerm</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="873"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2079"/> <source>Gas settings</source> - <translation type="unfinished"/> + <translation>Gassvalg</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="916"/> @@ -500,7 +500,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2122"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2207"/> <source>%O2</source> - <translation type="unfinished"/> + <translation>%O₂</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="921"/> @@ -508,7 +508,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2127"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2212"/> <source>%He</source> - <translation type="unfinished"/> + <translation>%He</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="926"/> @@ -524,122 +524,122 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2137"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2222"/> <source>Change depth</source> - <translation type="unfinished"/> + <translation>Endre dybde</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="936"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2142"/> <source>Gas 1</source> - <translation type="unfinished"/> + <translation>Gass 1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="941"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2147"/> <source>Gas 2</source> - <translation type="unfinished"/> + <translation>Gass 2</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="946"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2152"/> <source>Gas 3</source> - <translation type="unfinished"/> + <translation>Gass 3</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="951"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2157"/> <source>Gas 4</source> - <translation type="unfinished"/> + <translation>Gass 4</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="956"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2162"/> <source>Gas 5</source> - <translation type="unfinished"/> + <translation>Gass 5</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1021"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2227"/> <source>Dil 1</source> - <translation type="unfinished"/> + <translation>Dil 1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1026"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2232"/> <source>Dil 2</source> - <translation type="unfinished"/> + <translation>Dil 2</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1031"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2237"/> <source>Dil 3</source> - <translation type="unfinished"/> + <translation>Dil 3</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1036"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2242"/> <source>Dil 4</source> - <translation type="unfinished"/> + <translation>Dil 4</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1041"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2247"/> <source>Dil 5</source> - <translation type="unfinished"/> + <translation>Dil 5</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1086"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2282"/> <source>Set point [cbar]</source> - <translation type="unfinished"/> + <translation>Settpunkt [cbar]</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1091"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2287"/> <source>Change depth [m]</source> - <translation type="unfinished"/> + <translation>Endre dybde [m]</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1096"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2292"/> <source>SP 1</source> - <translation type="unfinished"/> + <translation>SP 1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1101"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2297"/> <source>SP 2</source> - <translation type="unfinished"/> + <translation>SP 2</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1106"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2302"/> <source>SP 3</source> - <translation type="unfinished"/> + <translation>SP 3</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1111"/> <source>SP 4</source> - <translation type="unfinished"/> + <translation>SP 4</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1116"/> <source>SP 5</source> - <translation type="unfinished"/> + <translation>SP 5</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1124"/> <source>O2 in calibration gas</source> - <translation type="unfinished"/> + <translation>O₂ i kalibreringsgass</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1148"/> <source>Fixed setpoint</source> - <translation type="unfinished"/> + <translation>Fast settpunkt</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1153"/> <source>Sensor</source> - <translation type="unfinished"/> + <translation>Sensor</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1161"/> @@ -2320,17 +2320,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2354,7 +2354,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2577,13 +2577,13 @@ </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Lagre</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Avbryt</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2717,32 +2717,32 @@ fra luft og bruker: <translation>&Fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>Skru pHe-graf av/på</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>Skru av/på utregning av vev</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>Skru av/på dekograf fra computer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Skru av/på dekograf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>Skru av/på NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Skru av/på 3m-inkrementer for dekotak</translation> </message> @@ -2752,42 +2752,42 @@ fra luft og bruker: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation>Skru av/på pO₂-graf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation>Skru av/på pN₂-graf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Skru av/på hjertefrekvens</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>Skru av/på MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>Skru av/på EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>Skru av/på SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>Skru av/på linjal</translation> </message> @@ -2856,6 +2856,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Åpne</translation> </message> @@ -3015,32 +3016,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> @@ -3205,80 +3206,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Åpne fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Avbryt</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Skriv ut løpetidstabel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Årsstatistikk</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vil du lagre endringene i fila %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vil du lagre endrinene i datafila?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Lagre endringer?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Lagre fil som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Åpne dykkelogg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Avslutt denne redigeringa før du starter en ny.</translation> </message> @@ -3939,82 +3950,88 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>Gjør til første dykkecomputer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Slett denne dykkecomputeren</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Legg til gassbytte</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Legg til bokmerke</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>Fjern hendelse</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Skjul lignende hendelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Rediger navn</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Vis alle hendelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Skjul hendelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Skjul alle %1 hendelser?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Fjern den valgte hendelsen?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Rediger navn på bokmerke</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Tilpasset navn:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation>Navnet er for langt</translation> </message> @@ -4125,12 +4142,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4157,12 +4174,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4394,7 +4411,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4730,12 +4747,12 @@ OS CPU-arkitektur: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4896,15 +4913,15 @@ Snitt</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>luft</translation> </message> @@ -4934,27 +4951,63 @@ Snitt</translation> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Kunne ikke åpne '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maks antall kolonner i CSV-importen er %d</translation> </message> @@ -4973,6 +5026,7 @@ Snitt</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -4986,6 +5040,7 @@ Snitt</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>oppstigning</translation> @@ -5032,6 +5087,7 @@ Snitt</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5118,107 +5174,107 @@ Snitt</translation> <translation>ugyldig hendelsesnummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Feil ved registrering av data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Feil ved lesing av dato</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Dykk %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Feil ved lesing av dykketid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Feil ved lesing av maksdybde</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation>Feil ved lesing av gassmiksantall</translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Feil ved lesing av salthetsgrad</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Klarte ikke å hente overflatetrykk</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Feil ved lesing av gassmiks</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Feil ved lesing av detaljer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Hendelse: Venter på bruker</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Feil ved registrering av hendelseshåndterer.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Feil ved registrering av avbruddshåndterer.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Feil ved import av dykkedata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Kunne ikke opprette kontekst for libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Fikk ikke åpnet %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5236,7 +5292,7 @@ Snitt</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Databasespørring get_events feilet. @@ -5244,51 +5300,51 @@ Snitt</translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>Databasespørring get_tags feilet. </translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Databaseforbindelse feilet '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Databasespørring feilet '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation>Databasespørring get_cylinders feilet. </translation> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation>Databasespørring get_changes feilet. </translation> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation>Databasespørring get_profile_sample feilet. </translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åpne stilark %s</translation> </message> @@ -5298,7 +5354,7 @@ Snitt</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>Finner ikke gassen %s</translation> </message> @@ -5343,56 +5399,76 @@ Snitt</translation> <translation>gass</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Overgang til %.*f %s på %d:%02d min - løpetid %d:%02u på %s</translation> </message> <message> - <location filename="../planner.c" line="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Bli ved %.*f %s i %d:%02d min - løpetid %d:%02u i %s</translation> </message> <message> - <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Bytt til gass %s</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Gassforbruk:</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Advarsel:</translation> </message> @@ -5402,37 +5478,37 @@ Snitt</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>dette er mer gass en det som er tilgjengelig i tanken!</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>ikke nok i reserve til å dele gass under oppstigning!</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s av %s (%.0f%s/%.0f%s i planlagt oppstigning)</translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s under planlagt oppstigning) av %s</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>høy pO₂-verdi %.2f ve %d:%02u med gass %s ved dybde %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5441,70 +5517,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5513,7 +5589,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5522,142 +5598,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Sikkerhetsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Sikkerhetsstopp: ukjent tid @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: ukjent tid @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>I deko </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (kalk.) </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>I deko (kalk.) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (kalk.) </translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (kalk.) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Kalkulert tak %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Vev %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>puls: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>retning: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts index fca57a44e..1976b2384 100644 --- a/translations/subsurface_nl_NL.ts +++ b/translations/subsurface_nl_NL.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation>Geen buddies</translation> </message> @@ -2323,17 +2323,17 @@ duikcomputer wilt verwijderen?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Deze functie is nog niet beschikbaar voor de geselecteerde duikcomputer</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation>Firmware bijwerken mislukt!</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation>Kan geen verbinding maken met de duikcomputer</translation> </message> @@ -2357,7 +2357,7 @@ duikcomputer wilt verwijderen?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation>Locatie niet ingesteld</translation> </message> @@ -2580,13 +2580,13 @@ duikcomputer wilt verwijderen?</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Opslaan</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Annuleren</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2720,32 +2720,32 @@ worden uit lucht en: <translation>Bestand</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>pHe grafiek in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>Berekening van alle compartimenten in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>Door DC aangegeven plafond in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Berekend plafond in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>NDL, TTS in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Berekend plafond in 3m stappen in-/uitschakelen</translation> </message> @@ -2755,42 +2755,42 @@ worden uit lucht en: <translation>Duikcomputer configureren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation>Duik opnieuw plannen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation>pO₂ grafiek in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation>pN₂ grafiek in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Toon/verberg hartslag</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>MOD in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>SAC in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>Meetlat in-/uitschakelen</translation> </message> @@ -2859,6 +2859,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Open</translation> </message> @@ -3018,32 +3019,32 @@ p, li { white-space: pre-wrap; } <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation>Grafiek schalen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation>Toon/verberg foto's</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation>Toon fles bar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation>Duiklijst filteren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation>Weefselgrafiek tonen/verbergen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> @@ -3208,80 +3209,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Bestand openen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Annuleren</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Runtime tabel afdrukken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Jaarlijkse statistieken</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that 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="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Wilt u de wijzigingen bewaren in het bestand?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Aanpassingen opslaan?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Bestand bewaren als</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Open duiklogboek</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation>Logboek bestanden (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran bestanden (*.can);;CSV bestanden (*.csv);;DiveLog.de bestanden (*.dld);;JDiveLog bestanden (*.jlb);;Liquivision bestanden (*.lvd);;MkVI bestanden (*.txt);;Suunto bestanden (*.sde *.db);;UDDF/UDCF bestanden (*.uddf *.udcf);;XML bestanden (*.xml);;Alle bestanden (*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Waarschuwing</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <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> @@ -3942,82 +3953,88 @@ p, li { white-space: pre-wrap; } <translation>NDL / TTS wordt niet getoond omdat de berekening te lang duurt</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>Eerste duikcomputer aanmaken</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Deze duikcomputer verwijderen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Gaswissel toevoegen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation> (Fles %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Bladwijzer toevoegen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>Gebeurtenis verwijderen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Gelijkaardige gebeurtenissen verbergen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Naam bewerken</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Toon alle gebeurtenissen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Gebeurtenissen verbergen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Alle %1 gebeurtenissen verbergen?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Geselecteerde gebeurtenis verwijderen?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Naam bladwijzer bewerken</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Naam:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation>Deze naam is te lang!</translation> </message> @@ -4128,12 +4145,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Deze functie is nog niet beschikbaar voor de geselecteerde duikcomputer.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation>Kon geen verbinding maken met de duikcomputer.</translation> </message> @@ -4160,12 +4177,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Deze functie is nog niet beschikbaar voor de geselecteerde duikcomputer.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation>Kon geen verbinding maken met de duikcomputer.</translation> </message> @@ -4397,7 +4414,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation>Lege trefwoorden</translation> </message> @@ -4736,12 +4753,12 @@ Besturingssysteem CPU %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Deze functie is nog niet beschikbaar voor de geselecteerde duikcomputer.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation>Kon geen verbinding maken met de duikcomputer.</translation> </message> @@ -4902,15 +4919,15 @@ Maximum</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) of (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>lucht</translation> </message> @@ -4940,27 +4957,63 @@ Maximum</translation> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Fout bij lezen van '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Poseidon import mislukt: kan '%s' niet lezen</translation> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation>Geen duikcomputer gevonden voor bestand '%s'</translation> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Het maximum aantal kolommen bij CSV importeren is %d</translation> </message> @@ -4979,6 +5032,7 @@ Maximum</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation>batterij</translation> </message> @@ -4992,6 +5046,7 @@ Maximum</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>opstijging</translation> @@ -5038,6 +5093,7 @@ Maximum</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5124,107 +5180,107 @@ Maximum</translation> <translation>ongeldig event-nummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Fout bij het registreren van de data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Fout bij verwerken van de datum en tijd</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Duik nr. %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Fout bij verwerken van de duikduur</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Fout bij het verwerken van de maximum duikdiepte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation>Fout bij het verwerken van de temperatuur</translation> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <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="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Fout bij het verkrijgen van het zoutgehalte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Fout bij bekomen van oppervlaktedruk</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation>Fout bij bepalen duikmodus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Fout bij het verwerken van het gasmengsel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Fout bij het verwerken van de samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Event: wachten op handeling van gebruiker</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Fout bij het registreren van de event handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Fout bij het registreren van de cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Fout bij importeren van duikdata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Kan geen context creëren voor libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Fout bij openen van %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Privileges ontoereikend voor toegang tot het toestel %s %s (%s)</translation> </message> @@ -5242,7 +5298,7 @@ Maximum</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Database-query get_events mislukt. @@ -5250,51 +5306,51 @@ Maximum</translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>Database query get_tags mislukt. </translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Databaseconnectie is mislukt '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Database-query mislukt: '%s' </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation>Database query get_cylinders mislukt. </translation> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation>Database query get_changes mislukt. </translation> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation>Database query get_profile_sample mislukt. </translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Kan de stylesheet %s niet openen</translation> </message> @@ -5304,7 +5360,7 @@ Maximum</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>Gas %s kan niet gevonden worden</translation> </message> @@ -5349,56 +5405,76 @@ Maximum</translation> <translation>gas</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Ga naar %.*f %s in %d:%02d min - runtime %d:%02u op %s</translation> </message> <message> - <location filename="../planner.c" line="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Blijf op %.*f %s gedurende %d:%02d min - runtime %d:%02u op %s</translation> </message> <message> - <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Gaswissel naar %s</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gasverbruik (uitgezonderd CCR segmenten):</translation> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Gasverbruik:</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Waarschuwing:</translation> </message> @@ -5408,37 +5484,37 @@ Maximum</translation> <translation>NIET-AANSPRAKELIJKHEIDSVERKLARING / WAARSCHUWING: DIT IS EEN NIEUWE IMPLEMENTATIE VAN HET BUHLMANN ALGORITME EN EEN IMPLEMENTATIE VAN EEN DUIKPLANNER DIE HIEROP GEBASEERD IS. BEIDE IMPLEMENTATIES HEBBEN MAAR EEN BEPERKTE MATE VAN TESTEN ONDERGAAN. WIJ RADEN MET KLEM AF DUIKEN UIT TE VOEREN DIE GEBASEERD ZIJN OP DE RESULTATEN DIE HIER GETOOND WORDEN.</translation> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>dit is meer gas dan beschikbaar in de geselecteerde duikfles!</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>niet genoeg reserve om gas te delen gedurende opstijging!</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s van %s (%.0f%s/%.0f%s in geplande opstijging)</translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s gedurende geplande opstijging) van %s</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>hoge pO₂ waarde %.2f op %d:%02u met gas %s op diepte %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>EAN</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5447,70 +5523,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO₂%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN₂%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5519,7 +5595,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5528,142 +5604,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Veiligheidsstop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Veiligheidsstop: onbek tijd @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: onbek tijd @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (berekend) </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>In deco (berekend) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (berekend) </translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (berekend) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Berekend plafond %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Compartiment %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>hartslag: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>koers: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts index 1ee1664e0..c0d59038d 100644 --- a/translations/subsurface_pl_PL.ts +++ b/translations/subsurface_pl_PL.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation>brak partnerów</translation> </message> @@ -962,7 +962,7 @@ <message> <location filename="../qt-ui/models.cpp" line="79"/> <source>Use</source> - <translation type="unfinished"/> + <translation>Użycie</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="191"/> @@ -2323,17 +2323,17 @@ wybrany komputer nurkowy?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation>Aktualizacja oprogramowania nieudana!</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation>Nie udało się połączyć z komputerem nurkowym.</translation> </message> @@ -2357,7 +2357,7 @@ wybrany komputer nurkowy?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation>nie podano miejsca</translation> </message> @@ -2581,13 +2581,13 @@ wybrany komputer nurkowy?</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Zapisz</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Anuluj</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2646,47 +2646,47 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/maintab.cpp" line="556"/> <source>Highest total SAC of a dive</source> - <translation type="unfinished"/> + <translation>Najwyższy SAC</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="557"/> <source>Lowest total SAC of a dive</source> - <translation type="unfinished"/> + <translation>Najniższy SAC</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="558"/> <source>Average total SAC of all selected dives</source> - <translation type="unfinished"/> + <translation>Średni SAC z wybranych nurkowań</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Highest temperature</source> - <translation type="unfinished"/> + <translation>Najwyższa temperatura</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Lowest temperature</source> - <translation type="unfinished"/> + <translation>Najniższa temperatura</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="571"/> <source>Average temperature of all selected dives</source> - <translation type="unfinished"/> + <translation>Średnia temperatura z wybranych nurkowań</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Longest dive</source> - <translation type="unfinished"/> + <translation>Najdłuższe nurkowanie</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Shortest dive</source> - <translation type="unfinished"/> + <translation>Najkrótsze nurkowanie</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average length of all selected dives</source> - <translation type="unfinished"/> + <translation>Średnia długość wybranych nurkowań</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="607"/> @@ -2721,32 +2721,32 @@ z powietrza przy użyciu: <translation>Plik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>Pokazuj wykres pHe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>Obliczenia dla wszystkich tkanek</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>Pokazuj sufit z komputera nurkowego</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Pokazuj obliczony sufit</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>Pokazuj NDL / TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Pokazuj obliczony sufit z krokiem 3m</translation> </message> @@ -2756,42 +2756,42 @@ z powietrza przy użyciu: <translation>Konfiguruj komputer nurkowy</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation>Zaplanuj nurkowanie ponownie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation>Pokazuj wykres pO2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation>Pokazuj wykres pN2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Pokazuj tętno</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>Pokazuj MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>Pokazuj EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>Pokazuj SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>Pokazuj linijkę</translation> </message> @@ -2860,6 +2860,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Otwórz</translation> </message> @@ -3019,32 +3020,32 @@ p, li { white-space: pre-wrap; } <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation>Skalowanie wykresu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation>Pokazuj zdjęcia</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation>Pokazuj pasek gazu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation>Filtrowanie nurkowań</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation>Pokazuj nasycenie tkanek</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> @@ -3209,80 +3210,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Otwórz plik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Anuluj</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Drukowanie planu nurkowego</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Statystyka roczna</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that 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="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Czy chcesz zapisać wprowadzone zmiany?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Zapisać zmiany?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Zapisz plik jako</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Otwórz plik z logiem</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation>Logi nurkowe (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Pliki Cochran (*.can);;Pliki CSV (*.csv);;Pliki DiveLog.de (*.dld);;Pliki JDiveLog (*.jlb);;Pliki Liquivision (*.lvd);;Pliki MkVI (*.txt);;Pliki Suunto (*.sde *.db);;Pliki UDDF/UDCF (*.uddf *.udcf);;Pliki XML (*.xml);;Wszystkie pliki (*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Ostrzeżenie</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Proszę dokończyć edycję tego nurkowania przed rozpoczęciem kolejnej. </translation> </message> @@ -3943,82 +3954,88 @@ p, li { white-space: pre-wrap; } <translation>Pokazywanie NDL / TTS zostało wyłączone z powodu zbyt długiego czasu obliczeń.</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>Ustaw jako pierwszy komputer nurkowy</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Usuń ten komputer nurkowy</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Dodaj zmianę gazu</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation> (Butla %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Dodaj notatkę</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>Usuń znacznik</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Ukryj podobne znaczniki</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Zmień nazwę</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Odkryj wszystkie znaczniki</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Ukrywanie wydarzeń</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Ukyć wszystkie wydarzenia typu %1?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Usunąć wybrane wydarzenie?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Zmień nazwę wydarzenia</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Własna nazwa:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation>Nazwa jest za długa!</translation> </message> @@ -4033,7 +4050,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/diveplanner.cpp" line="39"/> <source>OXYGEN</source> - <translation type="unfinished"/> + <translation>TLEN</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="224"/> @@ -4129,12 +4146,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation>Nie udało się połączyć z komputerem nurkowym.</translation> </message> @@ -4161,12 +4178,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation>Nie udało się połączyć z komputerem nurkowym.</translation> </message> @@ -4398,7 +4415,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation>brak tagów</translation> </message> @@ -4737,12 +4754,12 @@ Architektura OS CPU: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation>Nie udało się połączyć z komputerem nurkowym.</translation> </message> @@ -4898,15 +4915,15 @@ Maximum</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) lub (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>powietrze</translation> </message> @@ -4936,27 +4953,63 @@ Maximum</source> <translation>doczepiany</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Błąd odczytu '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Błąd importu: nie można odczytać '%s'</translation> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation>Nie znaleziono komputera nurkowego pasującego do pliku '%s'</translation> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maksymalna ilość kolumn danych przy imporcie CSV to %d</translation> </message> @@ -4975,6 +5028,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation>bateria</translation> </message> @@ -4988,6 +5042,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>wynurzanie</translation> @@ -5034,6 +5089,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5120,107 +5176,107 @@ Maximum</source> <translation>niepoprawny znacznik</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Błąd podczas przetwarzania danych</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Błąd podczas przetwarzania daty i czasu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Nurkowanie %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Błąd podczas przetwarzania czasu nurkowania</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Błąd podczas przetwarzania głębokości</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation>Błąd przy przetwarzaniu temperatury</translation> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <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="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Błąd podczas przetwarzania danych o zasoleniu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Błąd podczas przetwarzania danych o cienieniu atmosferycznym</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation>Błąd odczytywania trybu pracy komputera nurkowego </translation> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <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="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Błąd podczas przetwarzania próbek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Oczekiwanie na działanie użytkownika</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Błąd rejestracji uchwytu (event handler)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Błąd rejestracji uchwytu (cancellation handler)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Błąd podczas importowania danych</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Nie można utworzyć kontekstu libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Nie udało się otworzyć %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Brak uprawnień by otworzyć urządzenie %s %s (%s)</translation> </message> @@ -5238,7 +5294,7 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Zapytanie bazy danych get_events nie powiodło się.⏎ @@ -5246,51 +5302,51 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>Zapytanie bazy danych get_tags nie powiodło się. </translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Błąd połączenia z bazą danych '%s'.⏎ </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Błąd komunikacji z bazą danych '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation>Zapytanie bazy danych get_cylinders nie powiodło się. </translation> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation>Zapytanie bazy danych get_changes nie powiodło się. </translation> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation>Zapytanie bazy danych get_profile_sample nie powiodło się. </translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Nie można otworzyć arkusza stylów %s</translation> </message> @@ -5300,7 +5356,7 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>Nie można znaleźć gazu %s</translation> </message> @@ -5345,56 +5401,76 @@ Maximum</source> <translation>gaz</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <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="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <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="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Zmiana gazu na %s</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Zużycie gazu (nie uwzględnia CCR):</translation> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Zużycie gazu:</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Ostrzeżenie:</translation> </message> @@ -5404,37 +5480,37 @@ Maximum</source> <translation>OSTRZEŻENIE: TEN PLANER POSŁUGUJE SIĘ IMPLEMENTACJĄ ALGORYTMU BUHLMANNA, KTÓRA JEST NOWA I ZOSTAŁA PRZETESTOWANA W BARDZO OGRANICZONYM ZAKRESIE. ZDECYDOWANIE ODRADZAMY PLANOWANIE NURKOWANIA JEDYNIE W OPARCIU O REZULTATY DZIAŁANIA TEGO PROGRAMU.</translation> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>to więcej gazu niż masz w dostępnych butlach!</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>brak rezerwy na dzielenie się gazem z partnerem przy wynurzaniu!</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s gazu %s (%.0f%s/%.0f%s podczas wynurzania)</translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s podczas wynurzania) gazu %s</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>wysoki pO₂ o wartości %.2f w %d:%02u przy użyciu %s na głębokości %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5443,70 +5519,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5515,7 +5591,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5524,35 +5600,35 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Przystanek bezp.: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Przystanek bezp.: nieznany czas @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: nieznany czas @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>dekompresja @@ -5560,107 +5636,107 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (obliczone) </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>dekompresja (obliczone) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Obliczony sufit: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tkanka %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>tętno: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>kurs: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sGł:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sGł:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5782,17 +5858,17 @@ EADD: %d%s <message> <location filename="../dive.c" line="30"/> <source>OC-gas</source> - <translation type="unfinished"/> + <translation>gaz OC</translation> </message> <message> <location filename="../dive.c" line="30"/> <source>diluent</source> - <translation type="unfinished"/> + <translation>diluent</translation> </message> <message> <location filename="../dive.c" line="30"/> <source>oxygen</source> - <translation type="unfinished"/> + <translation>tlen</translation> </message> <message> <location filename="../dive.c" line="232"/> diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts index 750c4210c..688b22ded 100644 --- a/translations/subsurface_pt_BR.ts +++ b/translations/subsurface_pt_BR.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -2321,17 +2321,17 @@ o computador de mergulho selecionado?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2355,7 +2355,7 @@ o computador de mergulho selecionado?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2578,13 +2578,13 @@ o computador de mergulho selecionado?</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Salvar</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Cancelar</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2718,32 +2718,32 @@ misturados com ar usando: <translation>A&rquivo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>Alterna gráfico pHe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>Alterna calcular todos os tecidos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>Alterna teto calculado pelo computador</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Alterna teto calculado</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>Alterna NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Alterna teto calculado com incrementos de 3m</translation> </message> @@ -2753,42 +2753,42 @@ misturados com ar usando: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Alterna batimentos cardiacos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>alterna MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>Alterna EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>alterna taxa SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>Anternar visualização da régua</translation> </message> @@ -2857,6 +2857,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Abrir</translation> </message> @@ -3016,32 +3017,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> @@ -3206,80 +3207,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Abrir arquivo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Cancelar</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Imprimir tabela</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Você quer salvar as alterações que fez no arquivo %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Você quer salvar as alterações feitas no arquivo?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Salvar Alteraḉões?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Salvar arquivo como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Abrir arquivo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Primeiro termine a edição atual antes de editar outro.</translation> </message> @@ -3940,82 +3951,88 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>Marcar como primeiro computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Apagar este computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Esconder eventos semelhantes</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Editar nome</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Mostrar todos os eventos</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Ocultar eventos</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Esconder todos os %1 eventos?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Remover o evento selecionado?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Editar nome do favorito</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Apelido:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4126,12 +4143,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4158,12 +4175,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4395,7 +4412,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4733,12 +4750,12 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4899,15 +4916,15 @@ Médio</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) ou (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>ar</translation> </message> @@ -4937,27 +4954,63 @@ Médio</translation> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Falha na leitura de '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <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> @@ -4976,6 +5029,7 @@ Médio</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -4989,6 +5043,7 @@ Médio</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>subida</translation> @@ -5035,6 +5090,7 @@ Médio</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5121,107 +5177,107 @@ Médio</translation> <translation>número de evento inválido</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Erro no registo dos dados</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Erro na análise da data/horário</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Mergulho nº %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Erro na análise da duração do mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Erro na análise da profundidade máxima</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <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="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Erro na obtenção da salinidade da água</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <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="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <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="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Erro na análise das amostras</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Evento: aguardando ação do usuário</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Erro no registo do rótulo do evento.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Erro no registo do rótulo de cancelamento.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Erro ao importar os dados do mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Não é possivel criar contexto da libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Não se consegue abrir %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5240,7 +5296,7 @@ Médio</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>A consulta "get_events" falhou. @@ -5248,51 +5304,51 @@ Médio</translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>Pesquisa no banco de dados falhou no get_tags </translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Conexão à base de dados falhou '%s' </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Consulta da base de dados falhou '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation>Pesquisa no banco de dados falhou no get_cylinders </translation> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation>Pesquisa no banco de dados falhou no get_changes </translation> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation>Pesquisa no banco de dados falhou no get_profile_sample </translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Falha na abertura da folha de estilo %s</translation> </message> @@ -5302,7 +5358,7 @@ Médio</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>Não é possivel achar gas o %s</translation> </message> @@ -5347,56 +5403,76 @@ Médio</translation> <translation>gás</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Transição pra %.*f %s em %d:%02d min - tempo %d:%02u em %s</translation> </message> <message> - <location filename="../planner.c" line="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Fique em %.*f %s por %d:%02d min - durante %d:%02u em %s</translation> </message> <message> - <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Trocar o gás por %s</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Consumo de gás</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Aviso:</translation> </message> @@ -5406,37 +5482,37 @@ Médio</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>Isso é mais gás que a capacidade do cilindro especificado</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Sem reserva para compartilhar ar na subida</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durante a subida planejada) de %s</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valor pO₂ alto %.2f em %d:%02u com gás %s na profundidade %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5445,70 +5521,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5517,7 +5593,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5526,140 +5602,140 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Parada de segurança: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Parada de segurança: tempo desconhecido @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: tempo desconhecido @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>Em deco </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>Em deco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Teto calculado %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tecido %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>Cardio: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts index 595e3e40d..3d944c491 100644 --- a/translations/subsurface_pt_PT.ts +++ b/translations/subsurface_pt_PT.ts @@ -5,7 +5,7 @@ <message> <location filename="../qt-ui/simplewidgets.cpp" line="499"/> <source>Person: </source> - <translation>Pessoa:</translation> + <translation>Companheiro:</translation> </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="500"/> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation>Sem companheiros</translation> </message> @@ -167,7 +167,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="329"/> <source>CC</source> - <translation>CC</translation> + <translation>CF</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="334"/> @@ -235,7 +235,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="796"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1963"/> <source>Last deco</source> - <translation>Última descompressão</translation> + <translation>Último patamar</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="717"/> @@ -272,13 +272,13 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="533"/> <source>2s</source> - <translation>2s</translation> + <translation>2 s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="538"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1450"/> <source>10s</source> - <translation>10s</translation> + <translation>10 s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="405"/> @@ -733,17 +733,17 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1455"/> <source>20s</source> - <translation>20s</translation> + <translation>20 s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1460"/> <source>30s</source> - <translation>30s</translation> + <translation>30 s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1465"/> <source>60s</source> - <translation>60s</translation> + <translation>60 s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> @@ -759,12 +759,12 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1511"/> <source>24h</source> - <translation>24h</translation> + <translation>24 h</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1516"/> <source>12h</source> - <translation>12h</translation> + <translation>12 h</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1524"/> @@ -824,7 +824,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1935"/> <source>ZH-L16 CC</source> - <translation>ZH-L16 CC</translation> + <translation>ZH-L16 CF</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> @@ -834,7 +834,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1950"/> <source>L16-GF CC</source> - <translation>L16-GF CC</translation> + <translation>L16-GF CF</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1955"/> @@ -990,7 +990,7 @@ <message> <location filename="../qt-ui/divecomponentselection.ui" line="40"/> <source>Which components would you like to copy</source> - <translation>Que componentes deseja copiar</translation> + <translation>Que detalhes deseja copiar</translation> </message> <message> <location filename="../qt-ui/divecomponentselection.ui" line="46"/> @@ -1307,7 +1307,7 @@ remover o computador de mergulho seleccionado?</translation> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> <source>Subsurface XML</source> - <translation>Ficheiro XML do Subsurface</translation> + <translation>XML do Subsurface</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> @@ -1354,7 +1354,7 @@ remover o computador de mergulho seleccionado?</translation> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="14"/> <source>Export dive log files</source> - <translation>Exportar ficheiros de registos de mergulho</translation> + <translation>Exportar registo de mergulho para ficheiro</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="29"/> @@ -2323,17 +2323,17 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Esta característica não está ainda disponível para o computador de mergulho seleccionado.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation>A actualização do firmware falhou!</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation>Não foi possível estabelecer a ligação com o computador de mergulho</translation> </message> @@ -2357,7 +2357,7 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation>Não foi definido um local</translation> </message> @@ -2580,13 +2580,13 @@ remover o computador de mergulho seleccionado?</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Gravar</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Cancelar</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2720,32 +2720,32 @@ obtidos a partir do ar usando: <translation>&Ficheiro</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>Mostrar/ocultar gráfico de pHe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>Mostrar/ocultar cálculo para todos os tecidos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>Mostrar/ocultar o tecto indicado pelo computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Mostrar/ocultar o tecto calculado</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>Mostrar/ocultar NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Mostrar/ocultar tecto calculado com intervalos de 3 m</translation> </message> @@ -2755,42 +2755,42 @@ obtidos a partir do ar usando: <translation>Configurar &computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation>Planear novamente o &mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation>Mostrar/ocultar gráfico de pO2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation>Mostrar/ocultar gráfico da pN2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Mostrar/ocultar ritmo cardíaco</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>Mostrar/ocultar MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>Mostrar/ocultar EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>Mostrar/ocultar taxa de consumo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>Mostrar/ocultar régua</translation> </message> @@ -2859,6 +2859,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Abrir</translation> </message> @@ -2925,7 +2926,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="449"/> <source>&Copy dive components</source> - <translation>&Copiar componentes do mergulho</translation> + <translation>&Copiar detalhes do mergulho</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="452"/> @@ -2935,7 +2936,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="457"/> <source>&Paste dive components</source> - <translation>Colar Com&ponentes do mergulho</translation> + <translation>Colar detalhes do mergulho</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="460"/> @@ -3018,32 +3019,32 @@ p, li { white-space: pre-wrap; } <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation>Escalar gráfico</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation>Mostrar/ocultar imagens</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation>Mostrar/ocultar garrafas</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation>&Filtrar lista mergulhos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation>Mostrar/ocultar gráfico dos tecidos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> @@ -3208,80 +3209,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Abrir Ficheiro</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Cancelar</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Imprimir tabela de runtime</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Estatísticas anuais</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Deseja gravar as alterações feitas no ficheiro %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Deseja gravar as alterações feitas no ficheiro de dados?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Guardar alterações?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Guardar ficheiro como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Abrir ficheiro de registo de mergulhos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation>Ficheiros de logbooks (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Ficheiros Cochran (*.can);;Ficheiros CSV (*.csv);;Ficheiros DiveLog.de (*.dld);;JDiveLog files (*.jlb);;Ficheiros Liquivision (*.lvd);;Ficheiros MkVI (*.txt);;Ficheiros Suunto (*.sde *.db);;Ficheiros UDDF/UDCF (*.uddf *.udcf);;Ficheiros XML (*.xml);;Todos os ficheiros (*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <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> @@ -3549,7 +3560,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/preferences.ui" line="184"/> <source>Default dive log file</source> - <translation>Ficheiro de mergulho por defeito</translation> + <translation>Ficheiro de mergulho</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="215"/> @@ -3574,12 +3585,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/preferences.ui" line="294"/> <source>Default user ID</source> - <translation>ID do utilizador por defeito</translation> + <translation>ID do utilizador</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="304"/> <source>Save user ID locally?</source> - <translation>Gravar a ID do utilizador localmente?</translation> + <translation>Gravar o ID do utilizador localmente?</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="454"/> @@ -3803,7 +3814,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/printoptions.ui" line="41"/> <source>&6 dives per page</source> - <translation>&6mergulhos por página</translation> + <translation>&6 mergulhos por página</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="57"/> @@ -3942,82 +3953,88 @@ p, li { white-space: pre-wrap; } <translation>A visualização do NDL /TTS foi desactivada devido ao excessivo tempo de processamento</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>Tornar como primeiro computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Eliminar este computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Adicionar mudança de gás</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation>(Garrafa %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Adicionar marcador</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>Remover evento</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Esconder eventos semelhantes</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Editar nome</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Mostrar todos os eventos</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Ocultar eventos</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Ocultar todos os %1 eventos?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Remover o evento seleccionado?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Editar nome do marcador</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Nome personalizado:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation>O nome é demasiado comprido!</translation> </message> @@ -4128,12 +4145,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Esta característica não está ainda disponível para o computador de mergulho seleccionado.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation>Não foi possível estabelecer uma ligação ao computador de mergulho.</translation> </message> @@ -4160,12 +4177,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Esta característica não está ainda disponível para o computador de mergulho seleccionado.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation>Não foi possível estabelecer uma ligação ao computador de mergulho.</translation> </message> @@ -4397,7 +4414,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation>Etiquetas vazias</translation> </message> @@ -4692,7 +4709,7 @@ Arquitectura do CPU e SO: %1</translation> <message> <location filename="../qt-ui/webservices.ui" line="85"/> <source>Save user ID locally?</source> - <translation>Gravar a ID do utilizador localmente?</translation> + <translation>Gravar o ID do utilizador localmente?</translation> </message> <message> <location filename="../qt-ui/webservices.ui" line="92"/> @@ -4736,12 +4753,12 @@ Arquitectura do CPU e SO: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Esta característica não está ainda disponível para o computador de mergulho seleccionado.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation>Não foi possível estabelecer uma ligação ao computador de mergulho.</translation> </message> @@ -4902,15 +4919,15 @@ Média</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) ou (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>ar</translation> </message> @@ -4940,27 +4957,63 @@ Média</translation> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Falha na leitura de '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Falha ao importar Poseidon: não foi possíve ler '%s'</translation> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation>Não foi possível encontrar um computador de mergulho correspondente ao ficheiro '%s'</translation> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <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> @@ -4979,6 +5032,7 @@ Média</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation>bateria</translation> </message> @@ -4992,6 +5046,7 @@ Média</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>subida</translation> @@ -5038,6 +5093,7 @@ Média</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5124,107 +5180,107 @@ Média</translation> <translation>Número de evento inválido</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Erro no registo de dados</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Erro na análise da data/tempo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Mergulho nº %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Erro na análise do tempo de mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Erro na análise da profundidade máxima</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation>Erro ao analisar tempetaturas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <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="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Erro na obtenção da salinidade da água</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Erro na obtenção da pressão atmosférica</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation>Erro na obtenção do modo de mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <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="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Erro na análise das amostras</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Evento: à espera de acção do utilizador</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Erro no registo do "event handler".</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Erro no registo do "cancellation handler".</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Erro a importar os dados do mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Não é possivel criar contexto do libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Não se consegue abrir %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Não possui previlégios suficientes para abrir o dispositivo %s %s (%s)</translation> </message> @@ -5243,7 +5299,7 @@ Média</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>A consulta "obter eventos" falhou. @@ -5251,51 +5307,51 @@ Média</translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>Falha no query get_tags à base de dados. </translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Falha na ligação à base de dados '%s' </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>A consulta da base de dados falhou '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <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="2280"/> + <location filename="../parse-xml.c" line="2279"/> <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="2287"/> + <location filename="../parse-xml.c" line="2286"/> <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="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Não é possível abrir a folha de estilos %s</translation> </message> @@ -5305,7 +5361,7 @@ Média</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>Não foi possível encontrar o gás %s</translation> </message> @@ -5350,56 +5406,76 @@ Média</translation> <translation>gás</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Transição para %.*f %s em %d:%02d min - runtime %d:%02u com %s</translation> </message> <message> - <location filename="../planner.c" line="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Permanecer a %.*f %s for %d:%02d min - runtime %d:%02u com %s</translation> </message> <message> - <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Mudar para %s</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Consumo de gás (excluídas as fases c/CCR):</translation> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Consumo de gás:</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Aviso:</translation> </message> @@ -5410,37 +5486,37 @@ Média</translation> Recomenda-se aos utilizadores que não se baseiem apenas nesta ferramenta para planear os seus mergulhos.</translation> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>a quantidade de gás necessária excede a quantidade disponível na garrafa!</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>a reserva de gás não é suficiente para ser partilhada durante a subida!</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s na subida planeada)</translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durante a subida planeada) de %s</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valor pO₂ elevado %.2f em %d:%02u com gás %s à profundidade de %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5449,70 +5525,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5522,7 +5598,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5532,49 +5608,49 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Paragem de segurança: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Paragem de segurança: tempo desconhecido @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Descompressão: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Descompressão: tempo desconhecido @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>Em descompressão </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>TTS: %umin @@ -5582,93 +5658,93 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Descompressão: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>Em descompressão (calc) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Tecto calculado %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tecido %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>frequência cardíaca: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>enfiamento: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts index 24fb2140b..a69d5aff7 100644 --- a/translations/subsurface_ro_RO.ts +++ b/translations/subsurface_ro_RO.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -2321,17 +2321,17 @@ computerul de scufundări selectat?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2355,7 +2355,7 @@ computerul de scufundări selectat?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2578,13 +2578,13 @@ computerul de scufundări selectat?</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Înregistrare</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Anulează</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2716,32 +2716,32 @@ mixed from Air and using: <translation>&Fișier</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> @@ -2751,42 +2751,42 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> @@ -2851,6 +2851,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Deschide</translation> </message> @@ -3010,32 +3011,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> @@ -3200,80 +3201,90 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Anulează</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Avertizare</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3934,82 +3945,88 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Șterge evenimente similare</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Arată toate evenimentele</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Ascunde evenimente</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Ascunde toate %1 evenimentele?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Înlătură evenimentul selectat?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4120,12 +4137,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4152,12 +4169,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4389,7 +4406,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4724,12 +4741,12 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4890,15 +4907,15 @@ Medie</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) sau (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>aer</translation> </message> @@ -4928,27 +4945,63 @@ Medie</translation> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Nu s-a putut citi '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <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> @@ -4967,6 +5020,7 @@ Medie</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -4980,6 +5034,7 @@ Medie</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>ascensiune</translation> @@ -5026,6 +5081,7 @@ Medie</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5112,107 +5168,107 @@ Medie</translation> <translation>numărul evenimentul este invalid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Eroare înregistrând datele</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Eroare parsând data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Scufundarea %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Eroare parsând data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Eroare parsând adâncimea maximă</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation>Eroare parsând valoarea amestecului de gaz</translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Eroare obținând salinitatea apei</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Eroare obținând presiunea la suprafață</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Eroare parsând amestecul de gaz</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Eroare parsând eșantioanele</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Eveniment: aștept acțiunea utilizatorului</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Eroare la înregistrarea handlerului de evenimente.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Eroare la înregistrarea handlerului de anulare.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Eroare la importarea datelor despre scufundare</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Nu s-a putut crea contextul libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Nu s-a putut deschide %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5230,7 +5286,7 @@ Medie</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Query-ul get_events nu a reușit. @@ -5238,47 +5294,47 @@ Medie</translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <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="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <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="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Nu s-a putut deschide stylesheet-ul %s</translation> </message> @@ -5288,7 +5344,7 @@ Medie</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> @@ -5333,56 +5389,76 @@ Medie</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <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="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <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="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -5392,232 +5468,232 @@ Medie</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index 60d64ad39..342b187f2 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -2321,17 +2321,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2355,7 +2355,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2578,13 +2578,13 @@ </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Сохранить</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Отмена</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2718,32 +2718,32 @@ mixed from Air and using: <translation>Файл</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>График pHe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>Расчет всех тканей</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>Потолок компьютера</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Расчетный потолок</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>3м шаг для расчетного потолка</translation> </message> @@ -2753,42 +2753,42 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation>График pO₂</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation>График pN₂</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Пульс</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>Рулетка</translation> </message> @@ -2857,6 +2857,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Открыть</translation> </message> @@ -3016,32 +3017,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> @@ -3206,80 +3207,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Отмена</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Печать плана погружения</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Статистика за год</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Хотите ли вы сохранить изменения, внесенные в файл %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Хотите ли вы сохранить изменения, внесенные в файл журнала?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> @@ -3940,82 +3951,88 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>Сделать первым компьютером</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Удалить этот дайвкомпьютер</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Добавить замену газа</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Добавить закладку</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>Удалить событие</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Скрыть похожие события</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Показать все события</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Скрыть событие</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Спрятать все %1 события?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Удалить выбранное событие?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Название:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation>Слишком длинное название!</translation> </message> @@ -4126,12 +4143,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4158,12 +4175,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4395,7 +4412,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4734,12 +4751,12 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4900,15 +4917,15 @@ Maximum</source> <translation>кг</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) или (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>воздух</translation> </message> @@ -4938,27 +4955,63 @@ Maximum</source> <translation>карабины</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Ошибка чтения '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Для импорта CSV максимально допустимое кол-во колонок %d</translation> </message> @@ -4977,6 +5030,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -4990,6 +5044,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>подъем</translation> @@ -5036,6 +5091,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5122,107 +5178,107 @@ Maximum</source> <translation>неверный номер события</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <source>Unable to create parser for %s %s</source> <translation>Невозможно создать анализатор для %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Ошибка регистрации данных</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Ошибка разбора даты/времени</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Погр. №%d - %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Ошибка разбора времени погружения</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Ошибка разбора макс. глубины</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation>Ошибка разбора счетчика смесей</translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Ошибка получения солености воды</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Ошибка получения давления на поверхности</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Ошибка разбора смеси</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Ошибка разбора выборки</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Событие: ожидание действия пользователя</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Ошибка регистрации обработчика событий.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Ошибка регистрации обработчика завершения.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Ошибка импорта данных погружения</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Невозможно создать контекст libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Невозможно открыть %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5240,7 +5296,7 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Ошибка запроса get_events в БД. @@ -5248,51 +5304,51 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>Запрос get_tags в базу не выполнился. </translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Ошибка соединения с БД '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Ошибка запроса к БД '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation>Запрос get_cylinders в базу не выполнился. </translation> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation>Запрос get_changes в базу не выполнился. </translation> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation>Запрос get_profile_sample в базу не выполнился. </translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Невозможно открыть файл преобразования %s</translation> </message> @@ -5302,7 +5358,7 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>Невозможно найти газ %s</translation> </message> @@ -5347,56 +5403,76 @@ Maximum</source> <translation>смесь</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <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="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <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="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dмин</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Переключение на %s</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Расход газов:</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Внимание:</translation> </message> @@ -5406,37 +5482,37 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>расход выше чем запас газа в указанном баллоне!</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>недостаточно газа для резерва при подъеме</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s в запланированном подъеме)</translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s в запланированном подъеме) на %s</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>высокий pO₂ %.2f в %d:%02u на %s на глубине %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5445,70 +5521,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>Д: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>Т: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>С: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/мин </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fбар </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fбар </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fбар </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5517,7 +5593,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5526,142 +5602,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Ост. безопасности: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Ост. безопасности: неизв. время @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Деко: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Деко: неиз. время @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>В деко </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>NDL: %uмин </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>TTS: %uмин </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Деко: %uмин @ %.0f%s (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>В деко (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>NDL: %uмин (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TTS: %uмин (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Расчетный потолок %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Ткань %.0fмин: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>пульс: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>азимут: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sГ:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sГ:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sС:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sС:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sД:%d %s</translation> </message> diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts index 63b3f4db8..0188ac608 100644 --- a/translations/subsurface_sk_SK.ts +++ b/translations/subsurface_sk_SK.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -2323,17 +2323,17 @@ vybraný počítač?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Daná funkcia pre zvolený počítač zatiaľ nie je k dispozícii.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation>Nie je možné vytvoriť spojenie s počítačom.</translation> </message> @@ -2357,7 +2357,7 @@ vybraný počítač?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2580,13 +2580,13 @@ vybraný počítač?</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Uložiť</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Zrušiť</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2720,32 +2720,32 @@ vytvorene zo vzduchu a: <translation>&Súbor</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>Prepnúť pHe graf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>Prepnúť výpočet všetkých tkanív</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>Prepnúť zobrazenie stropu podľa počítača</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Prepnúť na vypočítaný strop</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>Prepnúť NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Prepnúť na </translation> </message> @@ -2755,42 +2755,42 @@ vytvorene zo vzduchu a: <translation>Konfigurácia počítača</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation>&Opätovné plánovanie ponoru</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation>Prepnúť pO₂ Graf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation>Prepnúť pN₂ Graf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Prepnúť tepovú frekvenciu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>Prepnúť MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>Prepnúť </translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>Prepnúť SAC spotrebu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>Prepnúť pravítko</translation> </message> @@ -2859,6 +2859,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Otvor</translation> </message> @@ -3018,32 +3019,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> @@ -3208,80 +3209,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Otvoriť súbor</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Zrušiť</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Vytlačiť runtime tabuľku</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Ročná štatistika</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that 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="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Chces uložiť zmeny prevedené v dátovom súbore?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Uložiť zmeny?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Uložiť súbor ako</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Otvoriť log súbor</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Upozornenie</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Ukonči aktuálne editovanie pred tým než začneš ďalšie.</translation> </message> @@ -3942,82 +3953,88 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Zmazať tento počítač</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Pridaj zmenu zmesi</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Pridať Bookmark</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>Vymazať udalosť</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Schovaj podobné udalosti</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Editovať meno</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Zobraziť všetky udalosti</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Schovaj udalosti</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Schovať všetky %1 udalosti?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Zmazať vybrané udalosti?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Editovať meno záložky</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Voliteľné meno:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation>Príliš dlhý názov!</translation> </message> @@ -4128,12 +4145,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Táto funkcia pre daný počítač zatiaľ nie je k dispozícii.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation>Nie je možné vytvoriť spojenie s počítačom.</translation> </message> @@ -4160,12 +4177,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Daná funkcia pre zvolený počítač zatiaľ nie je k dispozícii.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation>Nie je možné vytvoriť spojenie s počítačom.</translation> </message> @@ -4397,7 +4414,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4735,12 +4752,12 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Daná funkcia pre zvolený počítač zatiaľ nie je k dispozícii.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation>Nie je možné vytvoriť spojenie s počítačom.</translation> </message> @@ -4898,15 +4915,15 @@ Maximum</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) alebo (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>vzduch</translation> </message> @@ -4936,27 +4953,63 @@ Maximum</translation> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Chyba pri načítaní '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <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> @@ -4975,6 +5028,7 @@ Maximum</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -4988,6 +5042,7 @@ Maximum</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>výstup</translation> @@ -5034,6 +5089,7 @@ Maximum</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5120,107 +5176,107 @@ Maximum</translation> <translation>neplatné číslo udalosti</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Chyba registrácie dát</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Chyba spracovania času</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Ponor #%d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Chyba spracovania času ponoru</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Chyba spracovania maximálnej hĺbky</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation>Chyba spracovania dýchacích zmesí</translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Chyba získania slanosti vody</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Chyba pri zisťovaní tlaku na povrchu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Chyba spracovania zmesi plynu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Chyba spracovania vzoriek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Udalosť: Čakanie na vstup uživateľa</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Chyba registrácia správcu udalosti.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Chyba registrácie správcu ukončenia</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Chyba importu dát</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Problém inicializácie libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Nie je možné otvoriť %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5238,7 +5294,7 @@ Maximum</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Neúspešná požiadavka: get_events.⏎ @@ -5246,51 +5302,51 @@ Maximum</translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>Databázová požiadavka get_tags zlýhala. </translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Spojenie s databázou zlýhalo '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Požiadavka na databázu zlyhala '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation>Databázová požiadavka get_cylinders zlýhala. </translation> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation>Databázová požiadavka get_changes zlyhala. </translation> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation>Databázová požiadavka get_profile_sample zlyhala. </translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Neviem otvoriť šablónu </translation> </message> @@ -5300,7 +5356,7 @@ Maximum</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>Neviem nájsť zmes %s</translation> </message> @@ -5345,60 +5401,80 @@ Maximum</translation> <translation>plyn</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <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="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <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="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Zmena plynu na %s </translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Spotreba plynu: </translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Upozornenie:</translation> </message> @@ -5408,37 +5484,37 @@ Maximum</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>toto je väčšie množstvo plynu než je k dispozícií v danej fľaši!</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>žiadna rezerva pre zdieľanie zmesi počas výstupu!</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s z %s (%.0f%s/%.0f%s v plánovanom výstupe)</translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s počas plánovaného výstupu) z %s</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>vysoká pO₂ hodnota %.2f v %d:%02u so zmesou %s v hĺbke %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5447,70 +5523,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5519,7 +5595,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5528,142 +5604,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Bezpečnostná zastávka: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Bezpečnostná zastávka: neznáma @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: neznáma @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>V deco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Vypočítaný strop %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tkanivo %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>tep srdca: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>smer: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts index 13a6b14e7..cd158d164 100644 --- a/translations/subsurface_source.ts +++ b/translations/subsurface_source.ts @@ -18,7 +18,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation type="unfinished"></translation> </message> @@ -2321,17 +2321,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"></translation> </message> @@ -2355,7 +2355,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation type="unfinished"></translation> </message> @@ -2578,12 +2578,12 @@ </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> + <source>Apply changes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> + <source>Discard changes</source> <translation type="unfinished"></translation> </message> <message> @@ -2716,32 +2716,32 @@ mixed from Air and using: <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"></translation> </message> @@ -2751,42 +2751,42 @@ mixed from Air and using: <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation type="unfinished"></translation> </message> @@ -2851,6 +2851,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation type="unfinished"></translation> </message> @@ -3010,32 +3011,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation type="unfinished"></translation> </message> @@ -3200,80 +3201,90 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"></translation> </message> @@ -3934,82 +3945,88 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation type="unfinished"></translation> </message> @@ -4120,12 +4137,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"></translation> </message> @@ -4152,12 +4169,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"></translation> </message> @@ -4389,7 +4406,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"></translation> </message> @@ -4724,12 +4741,12 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"></translation> </message> @@ -4880,15 +4897,15 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation type="unfinished"></translation> </message> @@ -4918,27 +4935,63 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"></translation> </message> @@ -4957,6 +5010,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation type="unfinished"></translation> </message> @@ -4970,6 +5024,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation type="unfinished"></translation> @@ -5016,6 +5071,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5102,107 +5158,107 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"></translation> </message> @@ -5219,52 +5275,52 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation type="unfinished"></translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"></translation> </message> @@ -5274,7 +5330,7 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation type="unfinished"></translation> </message> @@ -5319,56 +5375,76 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../planner.c" line="601"/> <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="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../planner.c" line="621"/> <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="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation type="unfinished"></translation> </message> @@ -5378,231 +5454,231 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation type="unfinished"></translation> </message> diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts index c94a99cab..2ecab7c6c 100644 --- a/translations/subsurface_sv_SE.ts +++ b/translations/subsurface_sv_SE.ts @@ -5,20 +5,20 @@ <message> <location filename="../qt-ui/simplewidgets.cpp" line="499"/> <source>Person: </source> - <translation type="unfinished"/> + <translation>Person:</translation> </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="500"/> <source>Searches for buddies and divemasters</source> - <translation type="unfinished"/> + <translation>Sök efter parkamrater och divemasters</translation> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> - <translation type="unfinished"/> + <translation>Inga parkamrater</translation> </message> </context> <context> @@ -26,27 +26,27 @@ <message> <location filename="../configuredivecomputer.cpp" line="227"/> <source>Could not save the backup file %1. Error Message: %2</source> - <translation type="unfinished"/> + <translation>Kunde inte spara backupfilen %1. Felmeddelande: %2</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="243"/> <source>Could not open backup file: %1</source> - <translation type="unfinished"/> + <translation>Kunde inte öppna backupfilen: %1</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="567"/> <source>Setting successfully written to device</source> - <translation type="unfinished"/> + <translation>Inställningarna sparade till enheten</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="576"/> <source>Device firmware successfully updated</source> - <translation type="unfinished"/> + <translation>Enhetens firmware uppdaterades framgångsrikt</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> <source>Device settings successfully reset</source> - <translation type="unfinished"/> + <translation>Enhetens inställningar återställdes</translation> </message> </context> <context> @@ -54,7 +54,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/> <source>Configure dive computer</source> - <translation type="unfinished"/> + <translation>Konfigurera dykdatorer</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/> @@ -69,27 +69,27 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/> <source>Retrieve available details</source> - <translation type="unfinished"/> + <translation>Hämta tillgängliga detaljer</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="67"/> <source>Save changes to device</source> - <translation type="unfinished"/> + <translation>Spara ändringarna till enheten</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="93"/> <source>Backup</source> - <translation type="unfinished"/> + <translation>Backup</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="100"/> <source>Restore backup</source> - <translation type="unfinished"/> + <translation>Återställ backup</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="110"/> <source>Update firmware</source> - <translation type="unfinished"/> + <translation>Uppdatera firmware</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="134"/> @@ -99,35 +99,35 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="171"/> <source>OSTC 3</source> - <translation type="unfinished"/> + <translation>OSTC 3</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="210"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1242"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1618"/> <source>Basic settings</source> - <translation type="unfinished"/> + <translation>Grundläggande inställningar</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="216"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1337"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1634"/> <source>Serial No.</source> - <translation type="unfinished"/> + <translation>Serienummer.</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="239"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1360"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1657"/> <source>Firmware version</source> - <translation type="unfinished"/> + <translation>Firmware version</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="256"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1394"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1674"/> <source>Custom text</source> - <translation type="unfinished"/> + <translation>Konfigurerbar text</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/> @@ -137,22 +137,22 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="290"/> <source>English</source> - <translation type="unfinished"/> + <translation>Engelska</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="295"/> <source>German</source> - <translation type="unfinished"/> + <translation>Tyska</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="300"/> <source>French</source> - <translation type="unfinished"/> + <translation>Franska</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="305"/> <source>Italian</source> - <translation type="unfinished"/> + <translation>Italienska</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/> @@ -2321,17 +2321,17 @@ radera den valda dykdatorn?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2355,7 +2355,7 @@ radera den valda dykdatorn?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2578,13 +2578,13 @@ radera den valda dykdatorn?</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Spara</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>Avbryt</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2718,32 +2718,32 @@ mixas av luft och: <translation>&File</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>Slå av/på pHe grafen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>Slå av/på beräkningen av alla vävnader</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>Slå av/på dykdatorrapporterat takinformation</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Slå av/på beräknad takinformation</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation> Slå av/på NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Slå av/på beräknad takinformation i 3m steg</translation> </message> @@ -2753,42 +2753,42 @@ mixas av luft och: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Slå av/på hjärtrytm</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>Slå av/på MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>Slå av/på EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>Slå av/på SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>Slå av/på mätverktyget</translation> </message> @@ -2857,6 +2857,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Öppna</translation> </message> @@ -3016,32 +3017,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> @@ -3206,80 +3207,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Öppna fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>Avbryt</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>Skriv ut körtidstabell</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Årsstatistik</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vill du spara ändringarna som du gjort i filen %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vill du spara ändringarna som du gjort i filen?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Spara ändringar?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>Spara fil som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Öppna dyklogg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <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="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Varning</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Först avsluta den aktuella ändringen innan du försöker göra en annan.</translation> </message> @@ -3940,82 +3951,88 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>Gör till första dykdator</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Ta bort den här dykdatorn</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Lägg till gasbyte</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Lägg till bokmärke</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>Ta bort händelse</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Göm liknande händelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>Ändra namn</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>Visa alla händelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Göm händelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>Göm alla %1händelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Ta bort markerad händelse</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Ändra namnet på bokmärket</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Valt namn:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation>Namnet är för långt!</translation> </message> @@ -4126,12 +4143,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4158,12 +4175,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4395,7 +4412,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4731,12 +4748,12 @@ OS CPU Arkitektur: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4894,15 +4911,15 @@ Medel</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>luft</translation> </message> @@ -4932,27 +4949,63 @@ Medel</translation> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>Kunde inte öppna '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maximalt antalet kolumner i CSV import är %d</translation> </message> @@ -4971,6 +5024,7 @@ Medel</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -4984,6 +5038,7 @@ Medel</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>uppstigning</translation> @@ -5030,6 +5085,7 @@ Medel</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5116,107 +5172,107 @@ Medel</translation> <translation>okänt händelsenummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Kunde inte registrera parser-data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Kunde inte tolka tid och datum</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>Dyk #%d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Kunde inte tolka dyktid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Kunde inte tolka maxdjup</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation>Kunde inte tolka antal gasblandningar</translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Kunde inte ladda vattnets salthalt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Kunde inte få tag i tyck vid ytan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Kunde inte tolka gasblandning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Kunde inte tolka sampel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Händelse: väntar på användaren</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Kunde inte registrera event-funktion</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>Kunde inte registrera avbrytningsrutin</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Lyckades inte importera dykdata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>Kan inte skapa libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Kunde inte öppna fil %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5234,7 +5290,7 @@ Medel</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>Databasfråga get_events misslyckades. @@ -5242,51 +5298,51 @@ Medel</translation> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>Databasfrågan get_tags misslyckades. </translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Databasanslutning misslyckades '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Databasfråga misslyckades '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation>Databasfrågan get_cylinders misslyckades. </translation> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation>Databasfrågan get_changes misslyckades. </translation> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation>Databasfrågan get_profile_sample misslyckades. </translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>Kunde inte öppna formatmall %s</translation> </message> @@ -5296,7 +5352,7 @@ Medel</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>Kan inte hitta gas %s</translation> </message> @@ -5341,56 +5397,76 @@ Medel</translation> <translation>gas</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Förflytta till %.*f %s på %d:%02d min - körtid %d:%02u på %s</translation> </message> <message> - <location filename="../planner.c" line="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <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 - körtid %d:%02u på %s</translation> </message> <message> - <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>Byt gas till %s</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Gasförbrukning:</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Varning:</translation> </message> @@ -5400,37 +5476,37 @@ Medel</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>det här är mer gas än vad som finns tillgängligt i angiven cylinder!</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>inte nog med reserver för att kunna dela gas under uppstigningen!</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s av %s (%.0f%s/%.0f%s vid planerad uppstigning)</translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s under planerad uppstigning) av %s</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>högt pO₂ %.2f vid %d:%02u med gas %s på djup %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5439,70 +5515,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5511,7 +5587,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5520,142 +5596,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Säkerhetsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Säkerhetsstopp: okänd tid @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: okänd tid @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>I Deko </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>I deko (calc) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>Beräknat tak %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Vävnad %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>hjärtrytm: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>kurs: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> diff --git a/translations/subsurface_tr.ts b/translations/subsurface_tr.ts index c3ffd6c95..7e3a3fe7d 100644 --- a/translations/subsurface_tr.ts +++ b/translations/subsurface_tr.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -2321,17 +2321,17 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2355,7 +2355,7 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2578,13 +2578,13 @@ kaldırmak istediğinizden emin misiniz?</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Kaydet</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>İptal</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2716,32 +2716,32 @@ mixed from Air and using: <translation>&Dosya</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>pHe grafik değiştir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>Tüm doku hesaplamalarını değiştir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>Hesaplanan tavanı değiştir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>NDL, YZ geçişi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> @@ -2751,42 +2751,42 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>Kalp atış hızı geçişi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>MOD değiştir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>EHD, END, EHYD değiştir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>Cetvel geçişi</translation> </message> @@ -2851,6 +2851,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>Aç</translation> </message> @@ -3010,32 +3011,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> @@ -3200,80 +3201,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>Dosya aç</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>İptal</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Dosyayı kapatmadan önce geçerli dalışı düzenle, kaydet veya iptal et.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Bir dalış eklemeyi denemeden önce geçerli dalışı düzenle, kaydet veya iptal et.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>%1 dosyasında yapılan değişiklikleri kaydetmek istiyor musunuz?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Veri dosyasında yapılan değişiklikleri kaydetmek istiyor musunuz?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>Değişiklikler kaydedilsin mi ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>Dalış kayıt dosyasını aç</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>Uyarı</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Lütfen yeni bir dosya açmadan önce geçerli dalışı düzenle, kaydet veya iptal et.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <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="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3934,82 +3945,88 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>Dalış bilgisayarı sil</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>Gaz değişimi ekle</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>Yerimi ekle</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>OLay kaldır</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>Benzer olayları gizle</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>İsmi düzenle</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>Olayları gizle</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>Seçili olayları kaldırılsın mı ?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>Yeriminde ismi düzenle</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>Özel isim:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation>İsim çok uzun!</translation> </message> @@ -4120,12 +4137,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4152,12 +4169,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4389,7 +4406,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4727,12 +4744,12 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4892,15 +4909,15 @@ Ortalama</translation> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) veya (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>hava</translation> </message> @@ -4930,27 +4947,63 @@ Ortalama</translation> <translation>klipsli</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>'%s' okunamadı</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -4969,6 +5022,7 @@ Ortalama</translation> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -4982,6 +5036,7 @@ Ortalama</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>çıkış</translation> @@ -5028,6 +5083,7 @@ Ortalama</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5114,107 +5170,107 @@ Ortalama</translation> <translation>geçersiz olay numarası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Veri kaydedilirken hata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>Tarih saat ayrıştırma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>Dalış zamanı ayrıştırma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>Azami derinlik ayrıştırma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation>Gaz karışım sayısını ayrıştırma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>Su tuzluluğu edinme hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>Yüzey basıncı edinme hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>Gaz karışımı ayrıştırma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>Örnekleri ayrıştırma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>Olay: kullanıcı eylemi bekleniyor</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), seri=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>Olay işleyicisi kayıt hatası.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>Dalış verisi içe aktarma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5231,54 +5287,54 @@ Ortalama</translation> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>Veritabanı bağlantı başarısız '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>Veritabanı sorgusu başarısız '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -5288,7 +5344,7 @@ Ortalama</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>%s gaz bulunamıyor</translation> </message> @@ -5333,56 +5389,76 @@ Ortalama</translation> <translation>gaz</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <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="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <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="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3ddak</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>MSS</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OZB</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>Gaz tüketimi:</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>Uyarı:</translation> </message> @@ -5392,103 +5468,103 @@ Ortalama</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>MSS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5497,7 +5573,7 @@ EHYD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5506,130 +5582,130 @@ EHYD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %udak @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: bilinmeyen zaman @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>YZ: %udak </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>YZ: %udak (hesap) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts index e3c854790..825680186 100644 --- a/translations/subsurface_vi.ts +++ b/translations/subsurface_vi.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -2320,17 +2320,17 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2354,7 +2354,7 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2577,12 +2577,12 @@ bỏ các máy lặn đã được chọn?</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>Lưu lại</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> + <source>Discard changes</source> <translation type="unfinished"/> </message> <message> @@ -2715,32 +2715,32 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> @@ -2750,42 +2750,42 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> @@ -2850,6 +2850,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation type="unfinished"/> </message> @@ -3009,32 +3010,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> @@ -3199,80 +3200,90 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>Thống kê từng năm</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3933,82 +3944,88 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4119,12 +4136,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4151,12 +4168,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4388,7 +4405,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4723,12 +4740,12 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4879,15 +4896,15 @@ Maximum</source> <translation>ký</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) hoặc (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>không khí</translation> </message> @@ -4917,27 +4934,63 @@ Maximum</source> <translation>clip-on</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <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="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -4956,6 +5009,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -4969,6 +5023,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>đường dốc</translation> @@ -5015,6 +5070,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5101,107 +5157,107 @@ Maximum</source> <translation>chỉ số sự kiện không hợp lệ</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <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="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>Lỗi khi đăng ký dữ liệu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <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="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <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="464"/> + <location filename="../libdivecomputer.c" line="469"/> <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="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <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="513"/> + <location filename="../libdivecomputer.c" line="518"/> <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="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <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="569"/> + <location filename="../libdivecomputer.c" line="574"/> <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="706"/> + <location filename="../libdivecomputer.c" line="712"/> <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="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <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="779"/> + <location filename="../libdivecomputer.c" line="797"/> <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="800"/> + <location filename="../libdivecomputer.c" line="818"/> <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="839"/> + <location filename="../libdivecomputer.c" line="857"/> <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="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation>Không thể mở %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5219,7 +5275,7 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <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. @@ -5227,47 +5283,47 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <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="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <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="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -5277,7 +5333,7 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> @@ -5322,56 +5378,76 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <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="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <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="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -5381,231 +5457,231 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts index 60cff1ce0..598b26fbe 100644 --- a/translations/subsurface_zh_TW.ts +++ b/translations/subsurface_zh_TW.ts @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="232"/> + <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -2321,17 +2321,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1384"/> + <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1387"/> + <location filename="../configuredivecomputerthreads.cpp" line="1390"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1391"/> + <location filename="../configuredivecomputerthreads.cpp" line="1394"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2355,7 +2355,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="285"/> + <location filename="../qt-ui/filtermodels.cpp" line="286"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2578,13 +2578,13 @@ </message> <message> <location filename="../qt-ui/maintab.cpp" line="54"/> - <source>Save</source> - <translation>儲存</translation> + <source>Apply changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="58"/> - <source>Cancel</source> - <translation>取消</translation> + <source>Discard changes</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.cpp" line="262"/> @@ -2718,32 +2718,32 @@ mixed from Air and using: <translation>檔案</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="679"/> + <location filename="../qt-ui/mainwindow.ui" line="682"/> <source>Toggle pHe graph</source> <translation>切換 pHe 圖表</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="718"/> <source>Toggle calculating all tissues</source> <translation>切換計算所有的組織</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="691"/> + <location filename="../qt-ui/mainwindow.ui" line="694"/> <source>Toggle DC reported ceiling</source> <translation>切換 DC 回報的上限深度</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="703"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <source>Toggle calculated ceiling</source> <translation>切換計算的上限深度</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="775"/> + <location filename="../qt-ui/mainwindow.ui" line="778"/> <source>Toggle NDL, TTS</source> <translation>切換 NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="727"/> + <location filename="../qt-ui/mainwindow.ui" line="730"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>切換以每次增加 3m 計算的上限深度</translation> </message> @@ -2753,42 +2753,42 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="643"/> + <location filename="../qt-ui/mainwindow.ui" line="646"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="655"/> + <location filename="../qt-ui/mainwindow.ui" line="658"/> <source>Toggle pO2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="667"/> + <location filename="../qt-ui/mainwindow.ui" line="670"/> <source>Toggle pN2 Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="739"/> + <location filename="../qt-ui/mainwindow.ui" line="742"/> <source>Toggle heart rate</source> <translation>切換心跳率</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="754"/> <source>Toggle MOD</source> <translation>切換 MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="763"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>Toggle EAD, END, EADD</source> <translation>切換 EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="790"/> <source>Toggle SAC rate</source> <translation>切換 SAC 率</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="799"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Toggle ruler</source> <translation>切換規則</translation> </message> @@ -2857,6 +2857,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="217"/> <source>Open</source> <translation>開啟</translation> </message> @@ -3016,32 +3017,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="814"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="823"/> + <location filename="../qt-ui/mainwindow.ui" line="826"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="835"/> + <location filename="../qt-ui/mainwindow.ui" line="838"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> + <location filename="../qt-ui/mainwindow.ui" line="846"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="858"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="849"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> @@ -3206,80 +3207,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="211"/> + <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>Open file</source> <translation>開啟檔案</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="280"/> + <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <source>Cancel</source> + <translation>取消</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <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="387"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> <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="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Print runtime table</source> <translation>列印操作表格</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="763"/> + <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <source>Yearly Statistics</source> + <translation>年統計</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>您是否要對檔案 %1 所做的修改儲存?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="765"/> + <location filename="../qt-ui/mainwindow.cpp" line="779"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>您是否要對資料檔案所做的修改進行儲存?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="770"/> + <location filename="../qt-ui/mainwindow.cpp" line="784"/> <source>Save changes?</source> <translation>儲存變更?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1120"/> + <location filename="../qt-ui/mainwindow.cpp" line="1134"/> <source>Save file as</source> <translation>另存新檔</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1261"/> + <location filename="../qt-ui/mainwindow.cpp" line="1275"/> <source>Open dive log file</source> <translation>打開潛水日誌檔案</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1262"/> + <location filename="../qt-ui/mainwindow.cpp" line="1276"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="785"/> <source>Changes will be lost if you don't save them.</source> <translation>如果不進行儲存, 所做變更將會遺失.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="387"/> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="262"/> + <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Warning</source> <translation>提醒</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1104"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <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="1121"/> + <location filename="../qt-ui/mainwindow.cpp" line="1135"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1301"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>請在嘗試其他編輯時先完成當前編輯</translation> </message> @@ -3940,82 +3951,88 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1090"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> <source>Make first divecomputer</source> <translation>設定第 1 潛水電腦</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1092"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> <source>Delete this divecomputer</source> <translation>刪除此潛水電腦</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1099"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> <source>Add gas change</source> <translation>增加氣瓶交換</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> <source>Add bookmark</source> <translation>新增書籤</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1114"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1135"/> <source>Remove event</source> <translation>移除事件</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1119"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1140"/> <source>Hide similar events</source> <translation>隱藏相似事件</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1125"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1147"/> <source>Edit name</source> <translation>潛水名稱</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1139"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1176"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1183"/> + <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1198"/> <source>Unhide all events</source> <translation>取消隱藏所有事件</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide events</source> <translation>隱藏事件</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1173"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/> <source>Hide all %1 events?</source> <translation>隱藏所有 %1 事件?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1267"/> <source>Remove the selected event?</source> <translation>移除所選擇的事件？</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1209"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1268"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1291"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1350"/> <source>Edit name of bookmark</source> <translation>編輯書籤名稱</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1292"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1351"/> <source>Custom name:</source> <translation>自訂名稱:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1297"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1356"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4126,12 +4143,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="808"/> + <location filename="../configuredivecomputerthreads.cpp" line="810"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="801"/> + <location filename="../configuredivecomputerthreads.cpp" line="803"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4158,12 +4175,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1417"/> + <location filename="../configuredivecomputerthreads.cpp" line="1420"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1422"/> + <location filename="../configuredivecomputerthreads.cpp" line="1425"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4395,7 +4412,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/filtermodels.cpp" line="143"/> + <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4734,12 +4751,12 @@ OS CPU 架構: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1342"/> + <location filename="../configuredivecomputerthreads.cpp" line="1345"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1347"/> + <location filename="../configuredivecomputerthreads.cpp" line="1350"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4900,15 +4917,15 @@ Maximum</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1469"/> + <location filename="../dive.c" line="1480"/> <source>(%s) or (%s)</source> <translation>(%s) 或 (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1004"/> - <location filename="../planner.c" line="1007"/> + <location filename="../planner.c" line="1058"/> + <location filename="../planner.c" line="1061"/> <source>air</source> <translation>air</translation> </message> @@ -4938,27 +4955,63 @@ Maximum</source> <translation>吊掛式</translation> </message> <message> - <location filename="../file.c" line="109"/> - <location filename="../file.c" line="407"/> - <location filename="../file.c" line="470"/> - <location filename="../file.c" line="787"/> + <location filename="../file.c" line="112"/> + <location filename="../file.c" line="418"/> + <location filename="../file.c" line="481"/> + <location filename="../file.c" line="891"/> <source>Failed to read '%s'</source> <translation>無法讀取 '%s'</translation> </message> <message> - <location filename="../file.c" line="564"/> + <location filename="../file.c" line="575"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="604"/> + <source>Mouth piece position OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="608"/> + <source>Mouth piece position CC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="612"/> + <source>Mouth piece position unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="616"/> + <source>Mouth piece position not connected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="622"/> + <source>Power off</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="682"/> + <source>O2 calibration failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="684"/> + <location filename="../file.c" line="693"/> + <source>O2 calibration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="761"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="740"/> - <location filename="../file.c" line="779"/> - <location filename="../file.c" line="867"/> + <location filename="../file.c" line="844"/> + <location filename="../file.c" line="883"/> + <location filename="../file.c" line="971"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>CSV 匯入最大支援 %d 欄位.</translation> </message> @@ -4977,6 +5030,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> + <location filename="../file.c" line="628"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -4990,6 +5044,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> + <location filename="../file.c" line="650"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>上升</translation> @@ -5036,6 +5091,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> + <location filename="../file.c" line="742"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5122,107 +5178,107 @@ Maximum</source> <translation>錯誤的事件編號</translation> </message> <message> - <location filename="../libdivecomputer.c" line="421"/> + <location filename="../libdivecomputer.c" line="422"/> <source>Unable to create parser for %s %s</source> <translation>無法建立解析 %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="427"/> + <location filename="../libdivecomputer.c" line="428"/> <source>Error registering the data</source> <translation>錯誤的登錄資料</translation> </message> <message> - <location filename="../libdivecomputer.c" line="435"/> + <location filename="../libdivecomputer.c" line="436"/> <source>Error parsing the datetime</source> <translation>日期時間解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="451"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Dive %d: %s</source> <translation>潛水 %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="455"/> + <location filename="../libdivecomputer.c" line="460"/> <source>Error parsing the divetime</source> <translation>潛水時間解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="464"/> + <location filename="../libdivecomputer.c" line="469"/> <source>Error parsing the maxdepth</source> <translation>最大深度解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="482"/> + <location filename="../libdivecomputer.c" line="487"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="501"/> + <location filename="../libdivecomputer.c" line="506"/> <source>Error parsing the gas mix count</source> <translation>混合氣體數量解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="513"/> + <location filename="../libdivecomputer.c" line="518"/> <source>Error obtaining water salinity</source> <translation>得到錯誤的海水鹽度</translation> </message> <message> - <location filename="../libdivecomputer.c" line="521"/> + <location filename="../libdivecomputer.c" line="526"/> <source>Error obtaining surface pressure</source> <translation>得到錯誤的水面壓力</translation> </message> <message> - <location filename="../libdivecomputer.c" line="545"/> + <location filename="../libdivecomputer.c" line="550"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="562"/> + <location filename="../libdivecomputer.c" line="567"/> <source>Error parsing the gas mix</source> <translation>混合氣體解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="569"/> + <location filename="../libdivecomputer.c" line="574"/> <source>Error parsing the samples</source> <translation>樣本解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="706"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Event: waiting for user action</source> <translation>事件: 等待使用者動作</translation> </message> <message> - <location filename="../libdivecomputer.c" line="714"/> + <location filename="../libdivecomputer.c" line="720"/> <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="774"/> + <location filename="../libdivecomputer.c" line="792"/> <source>Error registering the event handler.</source> <translation>錯誤的註冊程序.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="779"/> + <location filename="../libdivecomputer.c" line="797"/> <source>Error registering the cancellation handler.</source> <translation>錯誤的註冊取消程序.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="818"/> <source>Dive data import error</source> <translation>匯入潛水資料錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="839"/> + <location filename="../libdivecomputer.c" line="857"/> <source>Unable to create libdivecomputer context</source> <translation>無法建立 libdivecomputer 上下文</translation> </message> <message> - <location filename="../libdivecomputer.c" line="846"/> + <location filename="../libdivecomputer.c" line="864"/> <source>Unable to open %s %s (%s)</source> <translation> 無法開啟 %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="853"/> + <location filename="../libdivecomputer.c" line="871"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5240,7 +5296,7 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1988"/> - <location filename="../parse-xml.c" line="2108"/> + <location filename="../parse-xml.c" line="2107"/> <source>Database query get_events failed. </source> <translation>資料庫讀取 get_events 失敗. @@ -5248,50 +5304,50 @@ Maximum</source> </message> <message> <location filename="../parse-xml.c" line="1995"/> - <location filename="../parse-xml.c" line="2115"/> + <location filename="../parse-xml.c" line="2114"/> <source>Database query get_tags failed. </source> <translation>數據庫請求get_tags失敗</translation> </message> <message> - <location filename="../file.c" line="170"/> + <location filename="../file.c" line="173"/> <source>Database connection failed '%s'. </source> <translation>資料庫連結錯誤 '%s' . </translation> </message> <message> - <location filename="../parse-xml.c" line="2139"/> - <location filename="../parse-xml.c" line="2160"/> - <location filename="../parse-xml.c" line="2309"/> + <location filename="../parse-xml.c" line="2138"/> + <location filename="../parse-xml.c" line="2159"/> + <location filename="../parse-xml.c" line="2308"/> <source>Database query failed '%s'. </source> <translation>資料庫要求錯誤 '%s' . </translation> </message> <message> - <location filename="../parse-xml.c" line="2273"/> + <location filename="../parse-xml.c" line="2272"/> <source>Database query get_cylinders failed. </source> <translation>資料庫讀取 get_cylinders 失敗。 </translation> </message> <message> - <location filename="../parse-xml.c" line="2280"/> + <location filename="../parse-xml.c" line="2279"/> <source>Database query get_changes failed. </source> <translation>資料庫讀取 get_changes 失敗。 </translation> </message> <message> - <location filename="../parse-xml.c" line="2287"/> + <location filename="../parse-xml.c" line="2286"/> <source>Database query get_profile_sample failed. </source> <translation>資料庫讀取 get_profile_sample 失敗。 </translation> </message> <message> - <location filename="../parse-xml.c" line="2378"/> + <location filename="../parse-xml.c" line="2377"/> <source>Can't open stylesheet %s</source> <translation>無法開啟樣式 %s</translation> </message> @@ -5301,7 +5357,7 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="770"/> + <location filename="../planner.c" line="818"/> <source>Can't find gas %s</source> <translation>無法找到氣體 %s</translation> </message> @@ -5346,56 +5402,76 @@ Maximum</source> <translation>氣體</translation> </message> <message> - <location filename="../planner.c" line="590"/> + <location filename="../planner.c" line="593"/> + <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="601"/> <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="600"/> + <location filename="../planner.c" line="614"/> + <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="621"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>停留在 %.*f %s for %d:%02d min - 運作時間 %d:%02u 於 %s</translation> </message> <message> - <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="634"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="614"/> - <location filename="../planner.c" line="618"/> + <location filename="../planner.c" line="637"/> + <location filename="../planner.c" line="641"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="650"/> + <source>(SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="675"/> + <source>Switch gas to %s (SP = %.1fbar)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="677"/> <source>Switch gas to %s</source> <translation>更換氣體至 %s</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="695"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="649"/> + <location filename="../planner.c" line="697"/> <source>OTU</source> <translation>氧容許量 OTU</translation> </message> <message> - <location filename="../planner.c" line="653"/> + <location filename="../planner.c" line="701"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="655"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption:</source> <translation>氣體消耗:</translation> </message> <message> <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="675"/> - <location filename="../planner.c" line="680"/> - <location filename="../planner.c" line="703"/> + <location filename="../planner.c" line="723"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="751"/> <source>Warning:</source> <translation>提醒:</translation> </message> @@ -5405,37 +5481,37 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="676"/> + <location filename="../planner.c" line="724"/> <source>this is more gas than available in the specified cylinder!</source> <translation>指定的氣瓶氣體超過供給量！</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="729"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>無足夠的預留氣體可供上升使用！</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="731"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s 在計畫上升中)</translation> </message> <message> - <location filename="../planner.c" line="685"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s 在計畫上升期間) of %s</translation> </message> <message> - <location filename="../planner.c" line="700"/> + <location filename="../planner.c" line="748"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>高 pO₂ 數值 %.2f 發生於 %d:%02u 使用氣體 %s 在深度 %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1008"/> + <location filename="../planner.c" line="1062"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1060"/> + <location filename="../profile.c" line="1056"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5444,63 +5520,63 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1063"/> + <location filename="../profile.c" line="1059"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1063"/> <source>T: %.1f%s </source> <translation>T: %.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1073"/> + <location filename="../profile.c" line="1069"/> <source>V: %.1f%s </source> <translation>V: %.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1076"/> + <location filename="../profile.c" line="1072"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1078"/> + <location filename="../profile.c" line="1074"/> <source>CNS: %u%% </source> <translation>CNS: %u%%</translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1076"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar</translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1078"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar</translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1080"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar</translation> </message> <message> - <location filename="../profile.c" line="1087"/> + <location filename="../profile.c" line="1083"/> <source>MOD: %d%s </source> <translation>MOD: %d%s</translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1090"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5509,7 +5585,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1094"/> <source>END: %d%s EADD: %d%s </source> @@ -5518,142 +5594,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1110"/> + <location filename="../profile.c" line="1106"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>安全停留: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1109"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>安全停留: 未知時間 @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1114"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1121"/> + <location filename="../profile.c" line="1117"/> <source>Deco: unkn time @ %.0f%s </source> <translation>減壓: 未知時間 @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1121"/> <source>In deco </source> <translation>減壓中 </translation> </message> <message> - <location filename="../profile.c" line="1127"/> + <location filename="../profile.c" line="1123"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1130"/> + <location filename="../profile.c" line="1126"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1129"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>減壓: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1137"/> <source>In deco (calc) </source> <translation>減壓 (計算) </translation> </message> <message> - <location filename="../profile.c" line="1143"/> + <location filename="../profile.c" line="1139"/> <source>NDL: %umin (calc) </source> <translation>NDL:%umin (預計) </translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1142"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1145"/> <source>Calculated ceiling %.0f%s </source> <translation>計算的上限深度 %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1155"/> + <location filename="../profile.c" line="1151"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>組織 %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1157"/> <source>heartbeat: %d </source> <translation>心跳: %d </translation> </message> <message> - <location filename="../profile.c" line="1163"/> + <location filename="../profile.c" line="1159"/> <source>bearing: %d </source> <translation>方位: %d </translation> </message> <message> - <location filename="../profile.c" line="1256"/> + <location filename="../profile.c" line="1252"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> + <location filename="../profile.c" line="1256"/> <location filename="../profile.c" line="1260"/> <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1268"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1272"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> + <location filename="../profile.c" line="1276"/> <location filename="../profile.c" line="1280"/> - <location filename="../profile.c" line="1284"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1291"/> + <location filename="../profile.c" line="1287"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> |