diff options
Diffstat (limited to 'translations')
30 files changed, 17274 insertions, 13607 deletions
diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts index 238838323..384b80855 100644 --- a/translations/subsurface_bg_BG.ts +++ b/translations/subsurface_bg_BG.ts @@ -2579,76 +2579,76 @@ GPS позиция:</translation> <translation>Запиши гмуркане като TeX макрота във файл.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Експорт на като UDDF файл</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> <source>UDDF files</source> <translation>UDDF файлове</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> <source>CSV files</source> <translation>CSV файлове</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> <source>HTML files</source> <translation>HTML файлове</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> <source>Subsurface files</source> <translation>Subsurface файлове</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>TeX files</source> <translation>TeX файлове</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>Export CSV file as</source> <translation>Експорт на СSV файл като</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export world map</source> <translation>Експорт на световна карта</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> <source>Export Subsurface XML</source> <translation>Експорт на Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Запиши дълбочините</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Експорт като TeX файл</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Експортирай HTML файлове като</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Моля изчакайте, експортиране...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Не може да бъде отворен файл %s</translation> </message> @@ -2989,41 +2989,61 @@ GPS позиция:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="157"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="192"/> - <location filename="../qt-models/diveplannermodel.cpp" line="277"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation>Бут.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Финална дълбочина</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Teчащо време</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Продълж. (мин.)</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Използван газ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="381"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>мин</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>м</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>фута</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3609,7 +3629,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Изтегли</translation> </message> @@ -3635,7 +3655,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Отмяна</translation> </message> @@ -3665,37 +3685,37 @@ p, li { white-space: pre-wrap; } <translation>Връзка:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Опитай пак</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Изход</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>Изтеглени гмуркания</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation>Информация:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Приеми</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Селектирай всички</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Деселектирай всички</translation> </message> @@ -4620,13 +4640,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>&Отмени</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>&Върни</translation> </message> @@ -4666,20 +4686,20 @@ p, li { white-space: pre-wrap; } <translation>Зареди облаковия слад онлайн</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="371"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="407"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Свържи се към</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="401"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Излючи се от</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1593"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Моля запишете или отменете текущата редакция на гмуркане преди да отворите нов файл.</translation> </message> @@ -4690,39 +4710,39 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Отмяна</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="629"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation>Не записвай празен регистър в облака</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="670"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Обходи папки с изображения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Сканирай</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>Сканиране за изборажения...(това може да отнеме доста време)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="707"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="858"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="968"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -4732,12 +4752,12 @@ p, li { white-space: pre-wrap; } <translation>Опит за смесване на гмуркания с %1мин. интервал помежду им</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> <source>Template backup created</source> <translation>Създаден бе бекъп на темплейти</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>The following backup printing templates were created: %1 @@ -4760,201 +4780,201 @@ can overwrite them on startup.</source> Subsurface може да ги подменя при стартирането си.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="732"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Моля затворете текущата редакция на гмуркане преди да затворите файла.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="858"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Моля запишете или отменете текущата редакция на гмуркане преди да добавите гмуркане.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="910"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Напечатай рунтайм таблица</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="968"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Опит за плануване на гмуркане, което не е планувано гмуркане.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Моля, първо приключете с редакцията преди да започнете нова.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Опит за редакция на гмуркане, което не е ръчно добавено.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1110"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Годишни статистики</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1331"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> <source>Dive log files</source> <translation>Гмуркачески регистър файлове</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1622"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> <source>Subsurface files</source> <translation>Subsurface файлове</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> <source>MkVI files</source> <translation>MkVI файлове</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> <source>All files</source> <translation>Всички файлове</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Желаете ли да запишете промените във файла %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Желаете ли да запишете промените във файла с данни?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Запиши промените?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <source>Changes will be lost if you don't save them.</source> <translation>Промените ще бъдат изгубени ако не ги запишете.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1621"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Запиши файла като</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1709"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[локален кеш за] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1711"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[облаков склад за] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1812"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>Отваряне на файл от стара версия</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1813"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Вие отворихте файл от стара версия на Subsurface. Моля прочетете Ръковордството на потребителя за да разберете за промените в новата версия и конкретно за редакцията на места за гмуркане. Subsurface вече се опита да попълни данните автоматично, но би било добре да проверите дали местата за гмуркане са правилни.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Отвори регистър файл</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>Връзване към обклаковия склад...</translation> </message> @@ -5071,89 +5091,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Отворена верига</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>фута/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Последен стоп на 20фута</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% средна дълбочина до 20фута</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20фута то повърхността</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>фута</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>м/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Последен стоп на 6 метра</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% средна дълбочина до 6м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6м до повърхността</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>кб.фута/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>л/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>бара</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -6016,17 +6036,17 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (№%1 от %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Непознат гмуркачески компютър</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Показването на NDL / TTS бе изключено поради прекалено дълго време за обработка на данните</translation> </message> @@ -6041,12 +6061,12 @@ Please export this template to a different file.</source> <translation>Направи първи гмуркачески компютър</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation>Планирано гмуркане</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation>Ръчно добавено гмуркане</translation> </message> @@ -7246,32 +7266,32 @@ Files with inappropriate date/time</source> <translation>Снимки</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Зареди изображение(изображения) от файл(файлове).</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Зареди изображение(изображения) от интернет</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>Изтрий избраните изображения</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>Изтрий всички изображения</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>Изтриване на изображения</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>Сигурни ли сте, че искате на изтриете всички изображения?</translation> </message> @@ -7853,24 +7873,24 @@ mixed from Air and using: <translation>Сървъра върна следната информация:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface проверява за нова версия всеки две седмици. Ако не желаете Subsurface да продължи да проверява, моля натиснете Откажи.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Откажи</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Приеми</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Автоматична проверка за обновления</translation> </message> @@ -8594,8 +8614,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1144"/> - <location filename="../core/planner.c" line="1147"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>кислород</translation> </message> @@ -8682,8 +8702,8 @@ Maximum</source> <message> <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1140"/> - <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>въздух</translation> </message> @@ -9219,11 +9239,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation>Времетраене: %dмин %s</translation> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Времетраене: %dмин<br></div></translation> @@ -9368,6 +9383,11 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>гмуркачески план </b> (установено припокриване на гмуркания)</translation> </message> <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Деко модел: Bühlmann ZHL-16C с GFLow = %d%% и GFHigh = %d%%</translation> @@ -9433,7 +9453,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Не може да бъде намерен газ %s</translation> </message> <message> - <location filename="../core/planner.c" line="1148"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> @@ -10631,11 +10651,6 @@ Uemis Zurich включен ли е правилно?</translation> <translation>Изтегли от леководолазен компютър</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="156"/> - <source>Apply GPS Fixes</source> - <translation>Приложи GPS позиции</translation> - </message> - <message> <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>Ръчна синхронизация с облака</translation> @@ -10671,6 +10686,11 @@ Uemis Zurich включен ли е правилно?</translation> <translation>Качване на GPS данни</translation> </message> <message> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation>Приложи GPS позиции</translation> + </message> + <message> <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Теглене на GPS данни</translation> diff --git a/translations/subsurface_ca.ts b/translations/subsurface_ca.ts index 9146e8965..ce78b8989 100644 --- a/translations/subsurface_ca.ts +++ b/translations/subsurface_ca.ts @@ -2581,76 +2581,76 @@ majoria dels detalls però no la informació sobre el perfil.</translation> <translation>Escriu la immersió com a macros de TeX en un fitxer.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Exporta el fitxer UDDF com a</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> <source>UDDF files</source> <translation>Fitxers UDDF</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> <source>CSV files</source> <translation>Fitxers en CSV</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> <source>HTML files</source> <translation>Fitxers en HTML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> <source>Subsurface files</source> <translation>Fitxers del Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>TeX files</source> <translation>Fitxers en TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>Export CSV file as</source> <translation>Exporta el fitxer CSV com a</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export world map</source> <translation>Exporta al mapamundi</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> <source>Export Subsurface XML</source> <translation>Exporta a l'XML del Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Desa la profunditat de les imatges</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Exporta a un fitxer TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Exporta els fitxers HTML com a</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Espereu un moment, mentre s'exporta...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>No s'ha pogut obrir el fitxer %s</translation> </message> @@ -2991,41 +2991,61 @@ majoria dels detalls però no la informació sobre el perfil.</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="157"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>Desconeguda</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="192"/> - <location filename="../qt-models/diveplannermodel.cpp" line="277"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation>cil.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Profunditat final</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Temps acumulat</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Durada</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Gas emprat</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="381"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>Punt d'ajust amb CC</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation>Temps de parada</translation> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3612,7 +3632,7 @@ a la llista d'immersions.</translation> </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Baixa</translation> </message> @@ -3638,7 +3658,7 @@ a la llista d'immersions.</translation> </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Cancel·la</translation> </message> @@ -3668,37 +3688,37 @@ a la llista d'immersions.</translation> <translation>Connexió:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Torna a intentar-ho</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Surt</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>Immersions baixades</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation>Informació:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Accepta</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Selecciona-ho tot</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Desselecciona-ho tot</translation> </message> @@ -4623,13 +4643,13 @@ Segur que voleu continuar?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>&Desfés</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>&Refés</translation> </message> @@ -4669,20 +4689,20 @@ Segur que voleu continuar?</translation> <translation>Pren l'emmagatzematge al núvol en línia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="371"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="407"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Connecta a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="401"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Desconnecta de</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1593"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Si us plau, deseu o cancel·leu l'edició de la immersió actual abans d'obrir un altre fitxer.</translation> </message> @@ -4693,39 +4713,39 @@ Segur que voleu continuar?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Cancel·la</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="629"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation>No desis un registre buit al núvol</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="670"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Travessa els directoris amb imatges</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Explora</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>S'estan cercant les imatges... (això pot trigar una estona)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="707"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="858"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="968"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Avís</translation> </message> @@ -4735,12 +4755,12 @@ Segur que voleu continuar?</translation> <translation>S'estan intentant fusionar les immersions amb un interval d'entre %1 min.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> <source>Template backup created</source> <translation>S'ha creat una còpia de seguretat de la plantilla</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>The following backup printing templates were created: %1 @@ -4763,202 +4783,202 @@ plantilles predeterminades són de només lectura i no s'han d'editar directament, ja que l'aplicació les pot sobreescriure quan s'inicia.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="732"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Si us plau, deseu o cancel·leu l'edició de la immersió actual abans de tancar el fitxer.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="858"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Si us plau, deseu o cancel·leu l'edició de la immersió actual abans d'intentar afegir-ne una altra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="910"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Imprimeix la taula del temps acumulat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="968"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>S'està intentant tornar a planificar una immersió que encara havia estat planificada.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Si us plau, finalitzeu l'edició actual abans d'intentar fer-ne una altra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>S'està intentant editar una immersió que no ha estat afegida manualment.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1110"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Estadístiques anuals</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1331"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> <source>Dive log files</source> <translation>Fitxers del diari de busseig</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1622"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> <source>Subsurface files</source> <translation>Fitxers del Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> <source>MkVI files</source> <translation>Fitxers MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> <source>APD log viewer</source> <translation>Visor del registre de la APD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> <source>All files</source> <translation>Tots els fitxers</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Voleu desar els canvis que heu fet en el fitxer %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Voleu desar els canvis que heu fet en el fitxer de dades?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Deso els canvis?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <source>Changes will be lost if you don't save them.</source> <translation>Si sortiu sense desar, els canvis es perdran.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1621"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Desa el fitxer com a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1709"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[cau local per a] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1711"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[emmagatzematge al núvol de] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1812"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>S'està obrint el fitxer de dades d'una versió anterior</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1813"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Has obert un fitxer de dades d'una versió anterior del Subsurface. Recomanem llegir el manual per aprendre sobre els canvis en la nova versió, especialment la gestió dels punts d'immersió que ha variat significativament. El Subsurface ja ha intentat omplir les dades, però potser valdrà la pena perdre un moment en donar una ullada al nou sistema per a la gestió dels punts d'immersió, per assegurar-vos que tot està correcte.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Obre un fitxer de diari de busseig</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>S'està contactant amb el servei al núvol...</translation> </message> @@ -5075,89 +5095,89 @@ Si el vostre dispositiu usa Bluetooth, feu els mateixos preparatius que per a ba <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Circuit obert</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Última parada a 20 peus</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% de la prof. mitja a 20 peus</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>De 20 peus a la superfície</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Última parada a 6 m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% de la prof. mitja a 6 m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>De 6 m a la superfície</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>peus/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -6020,17 +6040,17 @@ Exporteu aquesta plantilla a un fitxer diferent.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (núm. %1 de %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Ordinador de busseig desconegut</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Mostrar la LND / TTS ha estat inhabilitat pel temps de procès excessiu</translation> </message> @@ -6045,12 +6065,12 @@ Exporteu aquesta plantilla a un fitxer diferent.</translation> <translation>Crea el primer ordinador de busseig</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation>Immersió planificada</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation>Immersió afegida manualment</translation> </message> @@ -7248,32 +7268,32 @@ Fitxers amb una data/hora inapropiada</translation> <translation>Fotografies</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Carrega la/es imatge/s des de fitxer/s</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Carrega la/es imatge/s des del web</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>Suprimeix les imatges seleccionades</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>Suprimeix totes les imatges</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>Eliminació de les imatges</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>Esteu segur que voleu suprimir totes les imatges?</translation> </message> @@ -7854,24 +7874,24 @@ mixed from Air and using: <translation>El servidor ha retornat la següent informació:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>El Subsurface comprovarà cada dues setmanes si hi ha disponible una nova versió. Si no voleu qu continui fent-ho, feu clic a «Declina».</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Declina</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Accepta</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Comprova automàticament si hi ha actualitzacions</translation> </message> @@ -8595,8 +8615,8 @@ Màxim</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1144"/> - <location filename="../core/planner.c" line="1147"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>oxigen</translation> </message> @@ -8683,8 +8703,8 @@ Màxim</translation> <message> <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1140"/> - <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>aire</translation> </message> @@ -9216,11 +9236,6 @@ Podeu crear aquest fitxer de registre seleccionant la casella de selecció corre <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation>Temps acumulat: %dmin %s</translation> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Temps acumulat: %d min.<br></div></translation> @@ -9365,6 +9380,11 @@ Podeu crear aquest fitxer de registre seleccionant la casella de selecció corre <translation>pla d'immersió</b> (s'han detectat immersions superposades)</translation> </message> <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation>Temps acumulat: %dmin%s</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Model de descompressió Bühlmann ZHL-16C amb GFBaix = %d%% i GFAlt = %d%%</translation> @@ -9430,7 +9450,7 @@ Podeu crear aquest fitxer de registre seleccionant la casella de selecció corre <translation>No s'ha trobat el gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1148"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> @@ -10622,11 +10642,6 @@ Està connectat correctament el Uemis Zurich?</translation> <translation>Baixa des de l'ordinador de busseig</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="156"/> - <source>Apply GPS Fixes</source> - <translation>Aplica les correccions del GPS</translation> - </message> - <message> <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>Sincronitza manualment amb el núvol</translation> @@ -10662,6 +10677,11 @@ Està connectat correctament el Uemis Zurich?</translation> <translation>Publica les dades del GPS</translation> </message> <message> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation>Aplica les correccions del GPS</translation> + </message> + <message> <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Baixa les dades del GPS</translation> diff --git a/translations/subsurface_cs.ts b/translations/subsurface_cs.ts index f1f854b0f..dae6cb286 100644 --- a/translations/subsurface_cs.ts +++ b/translations/subsurface_cs.ts @@ -2578,76 +2578,76 @@ GPS polohu:</translation> <translation>Zapsat ponor jako TeX makra do souboru.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Exportovat UDDF soubor jako</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> <source>UDDF files</source> <translation>Soubory UDDF</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> <source>CSV files</source> <translation>Soubory CSV</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> <source>HTML files</source> <translation>Soubory HTML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> <source>Subsurface files</source> <translation>Soubory Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>TeX files</source> <translation>Soubory TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>Export CSV file as</source> <translation>Exportovat CSV soubor jako</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export world map</source> <translation>Exportovat mapu světa</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> <source>Export Subsurface XML</source> <translation>Exportovat Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Uložit hloubky pořízení obrázku</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Exportovat do TeX souboru</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Exportovat HTML soubory jako</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Čekejte, prosím, exportuje se...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Nelze otevřít soubor %s</translation> </message> @@ -2988,41 +2988,61 @@ GPS polohu:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="157"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>neznámý</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="192"/> - <location filename="../qt-models/diveplannermodel.cpp" line="277"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation>lahev</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Koncová hloubka</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Čas konce</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Délka</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Použitý plyn</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="381"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3608,7 +3628,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Stáhnout</translation> </message> @@ -3634,7 +3654,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Zrušit</translation> </message> @@ -3664,37 +3684,37 @@ p, li { white-space: pre-wrap; } <translation>Připojení:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Opakovat</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Ukončit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>Stažené ponory</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Přijmout</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Označit vše</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Odznačit vše</translation> </message> @@ -4619,13 +4639,13 @@ Jste si jisti, že chcete pokračovat?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>Zpět</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>Znovu</translation> </message> @@ -4665,20 +4685,20 @@ Jste si jisti, že chcete pokračovat?</translation> <translation>Internetové připojení k serverovému úložišti</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="371"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="407"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Připojit k</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="401"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Odpojit od</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1593"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Před otevřením nového souboru prosím uložte, nebo zrušte nynější úpravy ponoru.</translation> </message> @@ -4689,39 +4709,39 @@ Jste si jisti, že chcete pokračovat?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Zrušit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="629"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation>Neukládat prázdný log do serveru</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="670"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Procházet adresáře obrázků</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Prohledat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>Prohledávání obrázků... (může trvat delší dobu)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="707"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="858"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="968"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Varování</translation> </message> @@ -4731,12 +4751,12 @@ Jste si jisti, že chcete pokračovat?</translation> <translation>Pokus o sloučení ponorů s %1 min intervalem mezi nimi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> <source>Template backup created</source> <translation>Záloha šablony vytvořena</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>The following backup printing templates were created: %1 @@ -4759,202 +4779,202 @@ pouze pro čtení a neměly by být přímo editovány, protože aplikace je může při startu přepsat.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="732"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Před zavřením souboru přosím uložte, nebo zrušte nynější úpravy ponoru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="858"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Před přidáním ponoru prosím uložte, nebo zrušte nynější úpravy ponoru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="910"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Vypsat tabulku koncových časů</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="968"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Pokus o přeplánování ponoru, který není plánem ponoru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Před prováděním dalších úprav dokončete stávající úpravy.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Pokus o úpravu ponoru, který není ručně zadaným ponorem.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1110"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Roční statistiky</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1331"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> <source>Dive log files</source> <translation>Soubory potápěčského deníku</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1622"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> <source>Subsurface files</source> <translation>Soubory Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> <source>MkVI files</source> <translation>Soubory MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> <source>APD log viewer</source> <translation>Prohlížeč záznamů APD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> <source>All files</source> <translation>Všechny soubory</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Chcete uložit změny provedené v souboru %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Chcete uložit změny provedené v souboru s daty?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Uložit změny?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <source>Changes will be lost if you don't save them.</source> <translation>Změny budou ztraceny, pokud je neuložíte.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1621"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Uložit soubor jako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1709"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[místní vyrovnávací paměť pro] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1711"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[serverové úložiště pro] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1812"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>Otevírání datového souboru ze starší verze</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1813"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Otevřeli jste datový soubor starší verze Subsurface. Doporučujeme vám přečíst příručku, abyste zjistili změny v nové verzi, zvláště o správě potápěčských lokalit, která se značně změnila. Subsurface se pokusil předvyplnit data, ale může být užitečné podívat se na systém nové správy potápěčských lokalit a ujistit se, že vše vypadá správně.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Otevřít soubor potápěčského deníku</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>Spojení se serverovou službou...</translation> </message> @@ -5070,89 +5090,89 @@ Pokud vaše zařízení používá Bluetooth, udělejte stejné přípravy jako <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Otevřený okruh</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Poslední zastávka ve 20 stopách</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50 % průměrné hloubky do 20 stop</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20 stop na hladinu</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation> m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Poslední zastávka v 6 m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50 % průměrné hloubky do 6 m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6 m na hladinu</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation> ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -6015,17 +6035,17 @@ Exportujte prosím šablonu do jiného souboru.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (#%1 z %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Neznámý potápěčský počítač</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>NDL / TTS nebylo zobrazeno kvůli příliš dlouhému času zpracování</translation> </message> @@ -6040,12 +6060,12 @@ Exportujte prosím šablonu do jiného souboru.</translation> <translation>První potápěčský počítač</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation>Plánovaný ponor</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation>Ručně přidaný ponor</translation> </message> @@ -7245,32 +7265,32 @@ Files with inappropriate date/time</source> <translation>Fotografie</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Nahrát obrázek(y) ze souboru(ů)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Nahrát obrázek(y) z webu</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>Smazat vybrané obrázky</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>Smazat všechny obrázky</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>Mazání obrázků</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>Opravdu chcete smazat všechny obrázky?</translation> </message> @@ -7851,24 +7871,24 @@ ze vzduchu a následujících plynů:</translation> <translation>Server vrátil následující informace:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface kontroluje každé dva týdny, zda není dostupná nová verze. Pokud nechcete, aby Subsurface pokračoval v kontrole, klikněte na Odmítnout.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Odmítnout</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Přijmout</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Automatická kontrola aktualizací</translation> </message> @@ -8592,8 +8612,8 @@ Průměr</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1144"/> - <location filename="../core/planner.c" line="1147"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>kyslík</translation> </message> @@ -8680,8 +8700,8 @@ Průměr</translation> <message> <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1140"/> - <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>vzduch</translation> </message> @@ -9216,11 +9236,6 @@ Tento log soubor můžete vytvořit vybráním odpovídajícího checkboxu v sta <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation>Doba běhu: %dmin %s</translation> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Doba běhu: %dmin<br></div></translation> @@ -9365,6 +9380,11 @@ Tento log soubor můžete vytvořit vybráním odpovídajícího checkboxu v sta <translation>plán ponoru</b> (detekovány překrývající se plány)</translation> </message> <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekompresní model: Bühlmann ZHL-16C s GFLow = %d%% a GFHigh = %d%%</translation> @@ -9430,7 +9450,7 @@ Tento log soubor můžete vytvořit vybráním odpovídajícího checkboxu v sta <translation>Nelze najít směs %s</translation> </message> <message> - <location filename="../core/planner.c" line="1148"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> @@ -10628,11 +10648,6 @@ Je Uemis Zurich správně zapojen?</translation> <translation>Stáhnout z potápěčského počítače</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="156"/> - <source>Apply GPS Fixes</source> - <translation>Použít GPS pozice</translation> - </message> - <message> <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>Ruční synchronizace se serverem</translation> @@ -10668,6 +10683,11 @@ Je Uemis Zurich správně zapojen?</translation> <translation>Nahrát GPS data</translation> </message> <message> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation>Použít GPS pozice</translation> + </message> + <message> <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Stáhnout GPS data</translation> diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts index 2a8a0aa32..e87b26f01 100644 --- a/translations/subsurface_da_DK.ts +++ b/translations/subsurface_da_DK.ts @@ -5,7 +5,7 @@ <location filename="../mobile-widgets/qml/About.qml" line="10"/> <location filename="../mobile-widgets/qml/About.qml" line="19"/> <source>About Subsurface-mobile</source> - <translation type="unfinished"/> + <translation>Om Subsurface-mobile</translation> </message> <message> <location filename="../mobile-widgets/qml/About.qml" line="36"/> @@ -16,7 +16,7 @@ <message> <location filename="../mobile-widgets/qml/About.qml" line="37"/> <source>View your dive logs while on the go.</source> - <translation type="unfinished"/> + <translation>Se dine dykkerlogs på farten</translation> </message> <message> <location filename="../mobile-widgets/qml/About.qml" line="48"/> @@ -32,7 +32,7 @@ <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="54"/> <source>Navigate Back</source> - <translation type="unfinished"/> + <translation>Gå tilbage</translation> </message> </context> <context> @@ -43,66 +43,86 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Fundne enheder</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Gem</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Quit</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Skan</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> - <translation type="unfinished"/> + <translation>Nulstil</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Enheds detaljer</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Navn:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Adresse:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth startet</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Tænd/sluk</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Vælg enhed:</translation> @@ -113,22 +133,22 @@ <translation>Navn:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> - <translation type="unfinished"/> + <translation>Kunne ikke initialisere Winsock version2.2</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation>Forsøger at tænde Bluetooth enhed...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation>Forsøger at slukke Bluetooth enhed ....</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation type="unfinished"/> </message> @@ -160,22 +180,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation>UNPAIRED</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation>PARIED</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTHORIZED_PAIRED</translation> </message> @@ -185,113 +205,113 @@ <translation>%1 (%2) [Status: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Enheden %1 kan bruges til forbindelse. Du kan trykke på GEM knappen.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Enheden %1 skal parres før den kan bruges. Brug venligst contekst menuen for parrings muligheder.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation>Den lokale enhed blev ændret.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation>Pair</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> - <translation type="unfinished"/> + <translation>Ophæv parring</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> - <translation type="unfinished"/> + <translation>Forsøger at parre enheden %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> - <translation type="unfinished"/> + <translation>Forsøger at ophæve parringen med %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation>Ukendt fejl</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -312,7 +332,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>Ingen makkere</translation> </message> @@ -340,7 +360,7 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/> <source>Email</source> - <translation type="unfinished"/> + <translation>E-mail</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="71"/> @@ -350,12 +370,12 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="89"/> <source>PIN</source> - <translation type="unfinished"/> + <translation>PIN</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> <source>Register</source> - <translation type="unfinished"/> + <translation>Registrér</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> @@ -365,7 +385,7 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> <source>Sign-in or Register</source> - <translation type="unfinished"/> + <translation>Log ind eller registrér</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> @@ -551,7 +571,7 @@ <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="51"/> <source>Sample setpoint</source> - <translation type="unfinished"/> + <translation>Eksempel setpunkt</translation> </message> </context> <context> @@ -692,7 +712,7 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="241"/> <source>OSTC 4</source> - <translation type="unfinished"/> + <translation>OSTC 4</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="262"/> @@ -897,7 +917,7 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="530"/> <source>Compass gain</source> - <translation type="unfinished"/> + <translation>Kompasforstærkning</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="540"/> @@ -961,7 +981,7 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="612"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2043"/> <source>Sampling rate</source> - <translation type="unfinished"/> + <translation>Logningsinterval</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="623"/> @@ -1011,34 +1031,34 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="670"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2154"/> <source>End Depth</source> - <translation type="unfinished"/> + <translation>Slutdybde</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="680"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2171"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3205"/> <source> s</source> - <translation type="unfinished"/> + <translation> s</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="696"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1962"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3221"/> <source>Length</source> - <translation type="unfinished"/> + <translation>Længde</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="703"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2147"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3228"/> <source>Start Depth</source> - <translation type="unfinished"/> + <translation>Startdybde</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="710"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2161"/> <source>Reset Depth</source> - <translation type="unfinished"/> + <translation>Nulstil dybde</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="720"/> @@ -1064,13 +1084,13 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="793"/> <source>Left button sensitivity</source> - <translation type="unfinished"/> + <translation>Følsomhed venstre knap</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="800"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3553"/> <source>Always show pO₂</source> - <translation type="unfinished"/> + <translation>Vis altid pO₂</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="807"/> @@ -1089,7 +1109,7 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="821"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3304"/> <source>Pressure sensor offset</source> - <translation type="unfinished"/> + <translation>Tryksensoroffset</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="828"/> @@ -1179,7 +1199,7 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1068"/> <source>Right button sensitivity</source> - <translation type="unfinished"/> + <translation>Følsomhed højre knap</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1075"/> @@ -1195,7 +1215,7 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1089"/> <source>Dynamic ascent rate</source> - <translation type="unfinished"/> + <translation>Dynamisk opstigningshastighed</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1096"/> @@ -1226,13 +1246,13 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1174"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3580"/> <source>Temperature sensor offset</source> - <translation type="unfinished"/> + <translation>Temperatursensoroffset</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1181"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3587"/> <source>°C</source> - <translation type="unfinished"/> + <translation>°C</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1201"/> @@ -1488,7 +1508,7 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1770"/> <source>Sample rate</source> - <translation type="unfinished"/> + <translation>Logningsinterval</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1783"/> @@ -1609,107 +1629,107 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3267"/> <source>Travel gas consumption</source> - <translation type="unfinished"/> + <translation>Rejsegasforbrug</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3290"/> <source>Button sensitivity</source> - <translation type="unfinished"/> + <translation>Knapfølsomhed</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3420"/> <source>VPM</source> - <translation type="unfinished"/> + <translation>VPM</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3560"/> <source>VPM conservatism</source> - <translation type="unfinished"/> + <translation>VPM konservatisme</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3567"/> <source>+</source> - <translation type="unfinished"/> + <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Backup af dykker computer indstillinger</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> - <translation>Backup filer (*.xml)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> + <translation>Bakupfiler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>XML backup fejl</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>Det opstod en fejl under skrivning af backup fil: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Backup færdig med succes</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>Dine indstillinger er gemt til: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Gendan dykker computer indstillinger</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>XML gendannelses fejl</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>En fejl opstod under indlæsning af backup file %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>Gendannet med succes</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>Dine indstillinger er blevet gendannet med succes.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Vælg firmware fil</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> - <translation>Alle filer(*.*)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> + <translation>Alle filer</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> - <translation type="unfinished"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> + <translation>Logfiler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> - <translation>Logfiler (*.log)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1766,7 +1786,7 @@ <message> <location filename="../qt-models/cylindermodel.cpp" line="18"/> <source>Bot. MOD</source> - <translation type="unfinished"/> + <translation>Bund MOD</translation> </message> <message> <location filename="../qt-models/cylindermodel.cpp" line="18"/> @@ -1789,27 +1809,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>Klik her vil fjerne flasken</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Denne gas er i brug. Kun flasker som ikke bruges i dykket, kan fjernes</translation> </message> @@ -1923,131 +1943,132 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> - <translation type="unfinished"/> + <translation>Dykdetaljer</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Slet dyk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> - <translation type="unfinished"/> + <translation>Fortryd reigering</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> - <translation type="unfinished"/> + <translation>Vis på kort</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> - <translation type="unfinished"/> + <translation>Flere makkere</translation> </message> </context> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> - <translation type="unfinished"/> + <translation>Dyk %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Dato:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Lokation:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> - <translation type="unfinished"/> + <translation>Koordinater:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> - <translation type="unfinished"/> + <translation>Brug nuværende +GPS-position</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Dybde:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Varighed:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Luft temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Vand temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Dragt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Makker:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Vægt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> - <translation type="unfinished"/> + <translation>Flaske:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> - <translation type="unfinished"/> + <translation>Gasblaninding:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> - <translation type="unfinished"/> + <translation>Starttryk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> - <translation type="unfinished"/> + <translation>Sluttryk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> - <translation type="unfinished"/> + <translation>Sigtbarhed:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Noter:</translation> </message> @@ -2057,7 +2078,7 @@ GPS location:</source> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> - <translation type="unfinished"/> + <translation>Ingen profil</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> @@ -2072,7 +2093,7 @@ GPS location:</source> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> - <translation type="unfinished"/> + <translation>Flaske:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> @@ -2082,7 +2103,7 @@ GPS location:</source> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> - <translation type="unfinished"/> + <translation>Vis på kort</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> @@ -2092,7 +2113,7 @@ GPS location:</source> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> - <translation type="unfinished"/> + <translation>Sigtbarhed:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> @@ -2123,23 +2144,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> - <translation type="unfinished"/> + <translation>(Fl. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>Manuel skift til OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation>start</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation>slut</translation> @@ -2165,7 +2186,7 @@ GPS location:</source> <message> <location filename="../qt-models/diveimportedmodel.cpp" line="80"/> <source>h</source> - <translation type="unfinished"/> + <translation>h</translation> </message> <message> <location filename="../qt-models/diveimportedmodel.cpp" line="80"/> @@ -2180,7 +2201,7 @@ GPS location:</source> <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> - <translation type="unfinished"/> + <translation>Dykliste</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> @@ -2304,12 +2325,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation>Opret ny dykker lokation med dette navn</translation> </message> @@ -2554,76 +2575,76 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Eksporter UDDF fil som</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>UDDF filer (*.uddf *.UDDF)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <source>UDDF files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> - <translation>Eksporter CSV fil som</translation> + <source>CSV files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>CSV filer (*.csv *.CSV)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <source>HTML files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> - <translation>Eksporter verdens kort</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>HTML filer (*.html)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>TeX files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> - <translation>Eksporter Subsurface XML</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <source>Export CSV file as</source> + <translation>Eksporter CSV fil som</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>XML filer (*.xml *.ssrf)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <source>Export world map</source> + <translation>Eksporter verdens kort</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> - <source>Save image depths</source> - <translation type="unfinished"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <source>Export Subsurface XML</source> + <translation>Eksporter Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>Export to TeX file</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> + <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>Export to TeX file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Exporter HTML filer som</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Vent, eksporterer</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Kan ikke åbne filen %s</translation> </message> @@ -2768,7 +2789,7 @@ GPS location:</source> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/> <source>Sample setpoint</source> - <translation type="unfinished"/> + <translation>Eksempel setpunkt</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/> @@ -2918,9 +2939,9 @@ GPS location:</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> - <translation type="unfinished"/> + <translation>Flere makkere</translation> </message> </context> <context> @@ -2964,41 +2985,61 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>Ukendt</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Slut dybde</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Varighed</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Brugt gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min.</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3031,107 +3072,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Tryk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Farve</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Bruger tilføjet</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Tryk S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Tryk I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Loft</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Omgivende tryk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>Hjerte frekvens</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>Gradient factor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>Middel dybde @ s</translation> </message> @@ -3272,7 +3313,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> - <translation type="unfinished"/> + <translation>Land</translation> </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="523"/> @@ -3446,71 +3487,71 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Fejl</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Find Uemis dykker computer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> + <translation>Logfiler</translation> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> - <translation>Logfiler (*.log)</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Gem af libdivecomputer dump vil IKKE downloade dyk til listen</translation> </message> - <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> - <translation>Dump filer (*.bin)</translation> - </message> </context> <context> <name>DownloadFromDiveComputer</name> @@ -3579,7 +3620,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Download</translation> </message> @@ -3605,7 +3646,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Fortryd</translation> </message> @@ -3622,52 +3663,52 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> - <translation type="unfinished"/> + <translation>Priducent:</translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> - <translation type="unfinished"/> + <translation>Dykkercomputer:</translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> - <translation type="unfinished"/> + <translation>Forbindelse:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Prøv igen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Quit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> - <translation type="unfinished"/> + <translation>Downloadrede dyk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> - <translation type="unfinished"/> + <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Accept</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> - <translation type="unfinished"/> + <translation>Vælg alle:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> - <translation type="unfinished"/> + <translation>Fravælg alle</translation> </message> </context> <context> @@ -3696,12 +3737,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3791,7 +3832,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/ForwardButton.qml" line="50"/> <source>Navigate Forward</source> - <translation type="unfinished"/> + <translation>Gå frem</translation> </message> </context> <context> @@ -3799,7 +3840,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="396"/> <source>Back</source> - <translation type="unfinished"/> + <translation>Tilbage</translation> </message> </context> <context> @@ -3807,12 +3848,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/GpsList.qml" line="14"/> <source>GPS Fixes</source> - <translation type="unfinished"/> + <translation>GPS Fikspunkter</translation> </message> <message> <location filename="../mobile-widgets/qml/GpsList.qml" line="27"/> <source>Date: </source> - <translation type="unfinished"/> + <translation>Dato:</translation> </message> <message> <location filename="../mobile-widgets/qml/GpsList.qml" line="39"/> @@ -3822,12 +3863,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/GpsList.qml" line="51"/> <source>Latitude: </source> - <translation type="unfinished"/> + <translation>Breddegrad:</translation> </message> <message> <location filename="../mobile-widgets/qml/GpsList.qml" line="62"/> <source>Longitude: </source> - <translation type="unfinished"/> + <translation>Længdegrad:</translation> </message> </context> <context> @@ -3835,7 +3876,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../core/gpslocation.cpp" line="135"/> <source>Unknown GPS location</source> - <translation type="unfinished"/> + <translation>Ukendt GPS-position</translation> </message> </context> <context> @@ -3864,12 +3905,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> <source> (same GPS fix)</source> - <translation type="unfinished"/> + <translation>(Samme GPS-punkt)</translation> </message> <message> <location filename="../desktop-widgets/modeldelegates.cpp" line="499"/> <source> (~%1 away</source> - <translation type="unfinished"/> + <translation> (~%1 væk</translation> </message> <message numerus="yes"> <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> @@ -3895,7 +3936,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation>Stedet er ikke sat</translation> </message> @@ -3940,7 +3981,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> - <translation type="unfinished"/> + <translation>Dykkersteder på samme koordinater</translation> </message> <message> <location filename="../desktop-widgets/locationInformation.ui" line="138"/> @@ -3950,6 +3991,11 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> + <translation>Land</translation> + </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> <translation type="unfinished"/> </message> </context> @@ -3975,28 +4021,28 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> - <translation type="unfinished"/> + <translation>Flet til nuværende dykkersted</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> - <translation type="unfinished"/> + <translation>Fletter dykkersteder</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4014,8 +4060,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>Noter</translation> </message> @@ -4036,19 +4082,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>Luft temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>Vand temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>Position</translation> </message> @@ -4113,123 +4159,123 @@ p, li { white-space: pre-wrap; } <translation>Varighed</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>Information</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation>Statistik</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>Fotos</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation>Gem ændringer</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation>Drop ændringer </translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>Flasker </translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation>Tilføj flaske</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>Vægt</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation>Tilføj vægt system</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation>OC</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>Luft temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>Vand temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>Turen er ved at blive rettet.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>Flere dyk bliver rettet.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>Dette dyk bliver rettet.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>Tur notater</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>Tur lokation</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>Drop ændringerne?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation>Du er ved at droppe dine ændringer.</translation> </message> @@ -4242,451 +4288,451 @@ p, li { white-space: pre-wrap; } <translation>&Fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>&Vis</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>&Hjælp</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>&Importer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation>&Rediger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> - <translation type="unfinished"/> + <translation>Del</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>&Ny logbog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>Ny</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>&Åben logbog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>Åben</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>&Gem</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>Gem</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>Ge&m som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>Gem som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>&Luk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>Luk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>&Print</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>I&ndstillinger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>&Afslut</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>Importer fra &dive computer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importer &GPS data fra Subsurface webservice</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> - <translation type="unfinished"/> + <translation>Rediger enhedsnavne</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>&Tilføj dyk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation>&Rediger dyk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation>&Kopier dykker komponenter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation>&Indsæt dyk komponenter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>&Re-Nummerer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>Auto &grupering</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>&Årlig statistik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>&Dykker liste</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>&Alt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation>Fo&rige DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation>&Næste DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>&Om Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation>&Manual</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>&Planlæg dyk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>&Importer logfiler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>Importer dykkerlog fra andre programmer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>Importer fra divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>&Fuld skærm</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>Skift fuld skærm</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation>&Tjek for opdateringer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>&Eksporter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation>Exporter dykker logs</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation>Konfigurer &Dykker computer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation>pO₂graf fra/til</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation>pN₂ graf fra/til</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>Skift pH2 graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation>Skift DC rapporteret loft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation>Skift beregnet loft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation>Skift beregning af alle væv</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Skift beregnet loft med 3m stop</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>Skift hjerte frekvens</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>Skift MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>Skift EAD,END,EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation>Skift NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation>Skift SAC rate</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation>Skift måler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation>Skaler graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation>Billeder fra/til</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> - <translation>Tank tryk fra/til</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation>&Filtrer dykliste</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation>Bruger &undersøgelse</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>&Fortryd</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>Åben fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Fortryd</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Skan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>Skanner billeder...(dette kan tage noget tid)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Advarsel</translation> </message> @@ -4696,104 +4742,220 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Print runtime skema</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Årlig statistik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>CSV</source> + <translation>CSV</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <source>All files</source> + <translation>Alle filer</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <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="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Gem ændringer?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <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="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Gem fil som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Åben log fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4801,7 +4963,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4809,22 +4971,22 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4832,7 +4994,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4882,7 +5044,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> + <source>Firmware files</source> <translation type="unfinished"/> </message> </context> @@ -4907,89 +5069,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Open circuit</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>f/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Sidste stop på 20f</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% gnm. dybde til 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20ft til overflade</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Sidste stop på 6 meter</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% gnm. dybde til 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6m til overflade</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -5103,8 +5265,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5176,7 +5338,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="257"/> <source>+</source> - <translation type="unfinished"/> + <translation>+</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="184"/> @@ -5318,33 +5480,33 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Dato format</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation>Tids format</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation type="unfinished"/> </message> @@ -5354,27 +5516,37 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Sprog</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation>Genstart nødvendigt</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Valg af nyt sprog vil kræve en genstart af Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> <translation type="unfinished"/> </message> </context> @@ -5785,45 +5957,70 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and cannot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>Importer skabelon fil</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> - <translation>HTML filer (*.html)</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>Eksporter skabelon filer som</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation>Denne handling kan ikke fortrydes!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>Slet skabelon: %1?</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation type="unfinished"/> </message> </context> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (#%1 af %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Ukendt dykker computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Vis NDL / TTS blev slået fra, da det tog for lang tid at danne den.</translation> </message> @@ -5833,22 +6030,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Tilføj gas skift</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation>(Flaske %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> @@ -5858,6 +6050,11 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation>(Fl. %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> @@ -5890,7 +6087,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> @@ -5937,149 +6134,149 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> - <translation type="unfinished"/> + <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>min.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> - <translation type="unfinished"/> + <translation>Ukendt GPS-position</translation> </message> </context> <context> @@ -6175,7 +6372,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min.</translation> </message> @@ -6183,15 +6380,15 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> - <translation type="unfinished"/> + <translation>h</translation> </message> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation type="unfinished"/> </message> @@ -6363,7 +6560,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="38"/> <source>Email</source> - <translation type="unfinished"/> + <translation>E-mail</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="44"/> @@ -6516,7 +6713,7 @@ Not all images have timestamps in the range between </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> + <source>Image files</source> <translation type="unfinished"/> </message> <message> @@ -6630,7 +6827,7 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> + <source>Import messages (errors, warnings, etc)</source> <translation type="unfinished"/> </message> <message> @@ -6640,80 +6837,86 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> + <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> + <source>All files</source> + <translation>Alle filer</translation> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> <translation type="unfinished"/> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation>Medium</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation>Dykker dato: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation>Varighed: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> - <translation type="unfinished"/> + <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation>Dykker lokation: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation>Makker: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation> @@ -6908,7 +7111,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7007,7 +7210,7 @@ Files with inappropriate date/time</source> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="78"/> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="85"/> <source>h</source> - <translation type="unfinished"/> + <translation>h</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="78"/> @@ -7034,34 +7237,34 @@ Files with inappropriate date/time</source> <translation>Fotos</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> - <translation type="unfinished"/> + <translation>Slet alle billeder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> - <translation type="unfinished"/> + <translation>Sletter billeder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> - <translation type="unfinished"/> + <translation>Er du sikker på at du vil slette alle billeder?</translation> </message> </context> <context> @@ -7174,7 +7377,7 @@ Files with inappropriate date/time</source> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="96"/> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="98"/> <source>h</source> - <translation type="unfinished"/> + <translation>h</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="87"/> @@ -7237,7 +7440,7 @@ blandes fra Luft ved brug: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation type="unfinished"/> </message> @@ -7509,7 +7712,7 @@ blandes fra Luft ved brug: <message> <location filename="../qt-models/divetripmodel.cpp" line="366"/> <source>h</source> - <translation type="unfinished"/> + <translation>h</translation> </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="366"/> @@ -7567,7 +7770,7 @@ blandes fra Luft ved brug: <message> <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> - <translation type="unfinished"/> + <translation>Land</translation> </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="275"/> @@ -7641,23 +7844,23 @@ blandes fra Luft ved brug: <translation>Serveren returnerede følgende information:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Nej Tak</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Accept</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Kontroller automatisk efter opdateringer</translation> </message> @@ -7916,8 +8119,8 @@ Sprog: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -7943,7 +8146,7 @@ Sprog: %1</translation> <message> <location filename="../qt-models/yearlystatisticsmodel.cpp" line="64"/> <source>h</source> - <translation type="unfinished"/> + <translation>h</translation> </message> <message> <location filename="../qt-models/yearlystatisticsmodel.cpp" line="64"/> @@ -8041,21 +8244,12 @@ Gennemsnit</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8141,52 +8335,52 @@ Gennemsnit</translation> <message> <location filename="../core/datatrak.c" line="264"/> <source>fog</source> - <translation type="unfinished"/> + <translation>Tåge</translation> </message> <message> <location filename="../core/datatrak.c" line="267"/> <source>rain</source> - <translation type="unfinished"/> + <translation>Regn</translation> </message> <message> <location filename="../core/datatrak.c" line="270"/> <source>storm</source> - <translation type="unfinished"/> + <translation>Storm</translation> </message> <message> <location filename="../core/datatrak.c" line="273"/> <source>snow</source> - <translation type="unfinished"/> + <translation>Sne</translation> </message> <message> <location filename="../core/datatrak.c" line="293"/> <source>No suit</source> - <translation type="unfinished"/> + <translation>Ingen dragt</translation> </message> <message> <location filename="../core/datatrak.c" line="296"/> <source>Shorty</source> - <translation type="unfinished"/> + <translation>Shorty</translation> </message> <message> <location filename="../core/datatrak.c" line="299"/> <source>Combi</source> - <translation type="unfinished"/> + <translation>Kombi</translation> </message> <message> <location filename="../core/datatrak.c" line="302"/> <source>Wet suit</source> - <translation type="unfinished"/> + <translation>Våddragt</translation> </message> <message> <location filename="../core/datatrak.c" line="305"/> <source>Semidry suit</source> - <translation type="unfinished"/> + <translation>Semidy</translation> </message> <message> <location filename="../core/datatrak.c" line="308"/> <source>Dry suit</source> - <translation type="unfinished"/> + <translation>Tørdragt</translation> </message> <message> <location filename="../core/datatrak.c" line="368"/> @@ -8217,12 +8411,12 @@ Gennemsnit</translation> <message> <location filename="../core/datatrak.c" line="376"/> <source>fresh water</source> - <translation type="unfinished"/> + <translation>Ferskvand</translation> </message> <message> <location filename="../core/datatrak.c" line="378"/> <source>salt water</source> - <translation type="unfinished"/> + <translation>altvand</translation> </message> <message> <location filename="../core/datatrak.c" line="403"/> @@ -8232,7 +8426,7 @@ Gennemsnit</translation> <message> <location filename="../core/datatrak.c" line="405"/> <source>club dive</source> - <translation type="unfinished"/> + <translation>Klubdyk</translation> </message> <message> <location filename="../core/datatrak.c" line="407"/> @@ -8266,7 +8460,7 @@ Gennemsnit</translation> <message> <location filename="../core/datatrak.c" line="417"/> <source>search</source> - <translation type="unfinished"/> + <translation>Søg</translation> </message> <message> <location filename="../core/datatrak.c" line="426"/> @@ -8295,12 +8489,12 @@ Gennemsnit</translation> <message> <location filename="../core/datatrak.c" line="434"/> <source>other</source> - <translation type="unfinished"/> + <translation>Andet</translation> </message> <message> <location filename="../core/datatrak.c" line="445"/> <source>Other activities</source> - <translation type="unfinished"/> + <translation>Anden aktivitet</translation> </message> <message> <location filename="../core/datatrak.c" line="469"/> @@ -8386,8 +8580,8 @@ Gennemsnit</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>ilt</translation> </message> @@ -8472,15 +8666,10 @@ Gennemsnit</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> - <source>(%s) or (%s)</source> - <translation>(%s) eller (%s)</translation> - </message> - <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>luft</translation> </message> @@ -8490,27 +8679,27 @@ Gennemsnit</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>integreret</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>bælte</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>ankel</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>Clip-On</translation> </message> @@ -8693,23 +8882,23 @@ Gennemsnit</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>Ukendt</translation> @@ -8851,93 +9040,93 @@ Gennemsnit</translation> <translation>Fejl i fortolkning af gas blanding</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Kan ikke oprette parser for %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Fejl i registrering af data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Fejl i fortolkning af prøver</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Event: waiting for user action</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Fejl: registering the event handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Fejl: registering the cancellation handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Import fejl i dykker data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Kan ikke danne libdivecomputer context</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Kan ikke åbne %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -8953,19 +9142,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation> Mærkelig procent læsning %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation>Fejl i fortolkning af '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åbne stylesheet %s</translation> </message> @@ -8984,8 +9173,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation>Advarsel:</translation> </message> @@ -9011,16 +9200,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation type="unfinished"/> @@ -9123,6 +9302,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>SAC</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9145,6 +9339,16 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> @@ -9190,22 +9394,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <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="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>lav pO₂ værdi %.2f på %d:%02u med gas %s på dybde %.*f %s</translation> </message> @@ -9215,12 +9414,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Kan ikke finde gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9230,21 +9429,21 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min @@ -9252,219 +9451,225 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1427"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation>I deko </translation> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (calc)</translation> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation>In deko (beregn)</translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (beregn)</translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (beregn)</translation> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation>Beregnet loft %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Væv %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation>bærende: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s </translation> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation type="unfinished"/> </message> @@ -10246,7 +10451,7 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../smtk-import/smartrak.c" line="293"/> <source>Length</source> - <translation type="unfinished"/> + <translation>Længde</translation> </message> <message> <location filename="../smtk-import/smartrak.c" line="293"/> @@ -10301,7 +10506,7 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../core/taxonomy.c" line="10"/> <source>Country</source> - <translation type="unfinished"/> + <translation>Land</translation> </message> <message> <location filename="../core/taxonomy.c" line="11"/> @@ -10324,22 +10529,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1237"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> @@ -10352,117 +10557,117 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> - <translation type="unfinished"/> + <translation>Dykliste</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation>Præferencer</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation>Hjælp</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation type="unfinished"/> </message> @@ -10565,51 +10770,56 @@ p, li { white-space: pre-wrap; } <translation>Planlægning</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation>Planlæg gasbreaks</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>min.</translation> </message> @@ -10629,153 +10839,153 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation>Gå til første dybde</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> <source>Safety stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> <source>Conservatism level</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> <source>+</source> - <translation type="unfinished"/> + <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> + <translation>Dykker tilstand</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation>Gas muligheder</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>GFlow</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>Bund SAC</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation>Bund pO₂</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Noter</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>I planen, vis runtime (absolut tid) af stops </translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation>Vis runtime</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>I planen, vis varighed (relativ tid) af stops </translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation>Vis etappe varighed</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>I planen, vis overgangene og behandl disse implicit</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation>Vis overgange i deko</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation>Trin for trin dykkerplan</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation>Deco pO2</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation>Deco SAC</translation> </message> diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts index 19e87c69f..ba017a6c0 100644 --- a/translations/subsurface_de_CH.ts +++ b/translations/subsurface_de_CH.ts @@ -46,66 +46,86 @@ <translation>Externe Bluetooth Geräteauswahl</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Gefundene Geräte</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Beenden</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Durchsuchen</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Löschen</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Lokale Bluetooth Gerätedetails.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Name:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Adresse</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth eingeschaltet</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Ein-/ Ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Gerät wählen</translation> @@ -116,22 +136,22 @@ <translation>Name:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation>Konnte Winsock 2.2 nicht initialisieren</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation>Versuche das Bluetooth Gerät einzuschalten...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation>Versuche das Bluetooth Gerät auszuschalten...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation>Die externe Geräteliste wurde geleert.</translation> </message> @@ -163,22 +183,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation>Nicht verbunden</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation>Verbunden</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTORISIERT GEPAART</translation> </message> @@ -188,113 +208,113 @@ <translation>%1 (%2) [Status: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Das Gerät %1 kann nun für eine Verbindung benutzt werden. Sie können jetzt Speichern.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Das Gerät %1 muss zuerst verbunden werden bevor es genutzt werden kann.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation>Das locale Gerät wurde geändert.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation>Verbinden</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation>Verbindung löschen</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation>Versuche Gerät %1 zu verbinden</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation>Versuche Gerät %1 zu trennen</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation>Gerät %1 war nicht verbunden.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation>Gerät %1 war verbunden.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation>Gerät %1 wurde verbunden und ist autorisiert.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Das Gerät %1 kann nun für eine Verbindung benutzt werden. Sie können jetzt Speichern.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation>Gerätefehler: %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Verbindungsfehler. Sollte das externe Gerät einen PIN code benötigen verbinden Sie die Geräte bitte über Ihr Betriebssystem.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation>Unbekannter Fehler</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Bluetooth ist ausgeschaltet, bitte schalten Sie Bluetooth ein bevor Sie weiterfahren.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Schreibe oder Lesefehler auf oder zu Gerät ergab einen Fehler.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation>Ein unbekannter Fehler ist aufgetreten.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation>Geräte Suchfehler: %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>Nicht verfügbar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Auf den Bluetooth Adapter kann nicht zugegriffen werden.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Der Geräteerkennungsassistent wurde nicht erstellt, da Adresse %1 nicht der Adapteradresse eines lokalen Bluetooth-Geräts entspricht.</translation> </message> @@ -315,7 +335,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>Keine Buddies</translation> </message> @@ -1636,84 +1656,84 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Tauchcomputereinstellungen sichern</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> - <translation>Sicherungsdateien (*.xml)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>XML-Sicherungsfehler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>Beim Speichern der Datensicherungsdatei ist ein Fehler aufgetreten. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Sicherung abgeschlossen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>Deine Einstellungen wurden gespeichert nach: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Tauchcomputereinstellungen wiederherstellen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>XML-Wiederherstellungsfehler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Beim Wiederherstellen der Datensicherungsdatei ist ein Fehler aufgetreten. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>Wiederherstellung abgeschlossen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>Deine Einstellungen wurden erfolgreich wiederhergestellt.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Firmwaredatei auswählen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> - <translation>Alle Dateien (*.*)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> - <translation>Wählen Sie die Datei zum Herunterladen der Tauchcomputer-Protokolldatei aus</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> - <translation>Protokolldateien (*.log)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> + <translation>Wählen Sie die Datei zum Herunterladen der Tauchcomputer-Protokolldatei aus</translation> </message> </context> <context> @@ -1793,27 +1813,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>Hier klicken entfernt diese Flasche.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Tiefe für Gaswechsel, berechnet mittels Deko-pO₂ Voreinstellung, falls nicht explizit gesetzt.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Berechnet mittels pO₂ Voreinstellung. Setzen der MOD verändert O₂%. '*' als Wert wählt Best Mix O₂% bei maximaler Tiefe.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Berechnet mittels Best Mix END Voreinstellung. Setzen der MND verändert He%, '*' als Wert verwendet besten He-Anteil bei Maximaltiefe.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</translation> </message> @@ -1926,27 +1946,27 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation>Tauchgangsdetails</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Tauchgang löschen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation>Kartenansicht</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation>mehrere Tauchpartner</translation> </message> @@ -1954,104 +1974,104 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation>Tauchgang %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Datum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Ort:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation>Koordinaten:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation>Momentante GPS- Position verwenden</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Tiefe:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Dauer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Lufttemp.:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Wassertemp : </translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Anzug:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Gewicht:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation>Flasche:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation>Gemisch:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation>Anfangsdruck:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation>Enddruck:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Bewertung:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Notizen:</translation> </message> @@ -2127,23 +2147,23 @@ Position verwenden</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation> (Fl. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>Manuelles umschalten auf OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation> Anfang</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation> Ende</translation> @@ -2308,12 +2328,12 @@ Position verwenden</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Einen neuen Tauchplatz, basierend auf den Daten des aktuellen Tauchplatz, erstellen.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation>Neuer Tauchplatz mit diesem Name anlegen</translation> </message> @@ -2558,76 +2578,76 @@ Position verwenden</translation> <translation>Schreibe den Tauchgang als TeX-Makros in Datei.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>UDDF-Datei exportieren als</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>UDDF Dateien (*.uddf *.UDDF)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <source>UDDF files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> - <translation>CSV-Datei exportieren als</translation> + <source>CSV files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>CSV Dateien (*.csv *.CSV)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <source>HTML files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> - <translation>Weltkarte exportieren</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>HTML Dateien (*.html)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>TeX files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> - <translation>Exportiere Subsurface XML</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <source>Export CSV file as</source> + <translation>CSV-Datei exportieren als</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>XML Dateien (*.xml, *.ssrf)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <source>Export world map</source> + <translation>Weltkarte exportieren</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <source>Export Subsurface XML</source> + <translation>Exportiere Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Tiefe speichern, in der das Bild aufgenommen wurde</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Export in TeX-Datei</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> - <translation>TeX Dateien (*.tex)</translation> - </message> - <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>HTML-Datei exportieren als</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Bitte warten Sie, exportiere...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Kann Datei %s nicht öffnen</translation> </message> @@ -2922,7 +2942,7 @@ Position verwenden</translation> <translation><numerusform>(%n Tauchgang)</numerusform><numerusform>(%n Tauchgänge)</numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation>mehrere Tauchpartner</translation> </message> @@ -2968,41 +2988,61 @@ Position verwenden</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Endtiefe</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Gasverbrauch</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>CC Sollwert</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3035,107 +3075,107 @@ Position verwenden</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Zeit</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Druck</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Farbe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Benutzer Eingabe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Druck S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Druck I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Tiefster Deko-Stopp</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Einstellwert</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Umgebungsdruck</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>Pulsrate</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>Gradientenfaktor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>Mittlere Tiefe @ s</translation> </message> @@ -3455,71 +3495,71 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Herunterladen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation>Wählen Sie den Bluetooth download Modus</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Finde Uemis Tauchcomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation>Herunterladen abbrechen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation>Wählen Sie die Datei zum Herunterladen der Tauchcomputer-Protokolldatei aus</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation>Wählen Sie die Datei aus, in die der libdivecomputer Dump gespeichert werden soll</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> - <translation>Herunterladen wiederholen</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> - <translation>Protokolldateien (*.log)</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> + <translation>Herunterladen wiederholen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Wenn der libdivecomputer Dump gespeichert wird, werden keine Tauchgänge zur Liste der Tauchgänge hinzugefügt.</translation> </message> - <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> - <translation>Dump Dateien (*.bin)</translation> - </message> </context> <context> <name>DownloadFromDiveComputer</name> @@ -3588,7 +3628,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Herunterladen</translation> </message> @@ -3614,7 +3654,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> @@ -3644,37 +3684,37 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Wiederholen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Beenden</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>Ausgelesene Tauchgänge</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Annehmen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Alles auswählen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Alle abwählen</translation> </message> @@ -3705,12 +3745,12 @@ p, li { white-space: pre-wrap; } <translation>Verbinden mit Facebook Text Platzhalter</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Die Facebook-Verbindung kann mit dem "Teilen" Menüeintrag beendet werden.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Um Subsurface mit Facebook zu verbinden, bitte einloggen. Damit ist es möglich, Tauchgänge auf Facebook zu posten.</translation> </message> @@ -3904,7 +3944,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation>Kein Ort festgelegt</translation> </message> @@ -3961,6 +4001,11 @@ p, li { white-space: pre-wrap; } <source>Country</source> <translation>Land</translation> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> + <translation type="unfinished"/> + </message> </context> <context> <name>LocationInformationModel</name> @@ -3984,29 +4029,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation>Tauchplatzverwaltung</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> <translation>Mit aktuellem Tauchplatz zusammenführen</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> <translation>Tauchplätze zusammenführen</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation>Du bist dabei zwei Tauchplätze zu kombinieren, Du kannst diesen Vorgang nicht rückgängig machen. Möchtest Du fortfahren?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation>Du bearbeitest einen Tauchplatz</translation> </message> @@ -4024,8 +4069,8 @@ Möchtest Du fortfahren?</translation> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>Notizen</translation> </message> @@ -4046,19 +4091,19 @@ Möchtest Du fortfahren?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>Wassertemp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>Ort</translation> </message> @@ -4123,123 +4168,123 @@ Möchtest Du fortfahren?</translation> <translation>Dauer</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation>Zusatzdaten</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>Information</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation>Statistiken</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>Bilder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation>Änderungen anwenden</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation>Änderungen Verwerfen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>Flaschen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation>Flasche hinzufügen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>Blei</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation>Gewicht hinzufügen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation>OC</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation>Freitauchgang</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>Lufttemp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>Wassertemp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>Diese Reise wird bearbeitet.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>Mehrere Tauchgänge werden bearbeitet.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>Dieser Tauchgang wird bearbeitet.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>Reisenotizen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>Reiseort</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation>Neuer Tauchplatz</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>Änderungen verwerfen?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation>Du bist im Begriff, die Änderungen zu Verwerfen.</translation> </message> @@ -4252,451 +4297,451 @@ Möchtest Du fortfahren?</translation> <translation>&Datei</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>&Logbuch</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>&Ansicht</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>&Hilfe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>&Importieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation>B&earbeiten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> <translation>Teilen auf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>&Neues Logbuch</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>Neu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>Logbuch &öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>Öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>&Speichern</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>Speichern als</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>Speichern unter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>Schliessen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>Schliessen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>&Drucken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>&Beenden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>Von &Tauchcomputer importieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>GPS-Daten vom Subsurface-Webdienst importieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> <translation>Geräte &Namen bearbeiten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>Tauchgang hinzufügen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation>Tauchgang b&earbeiten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation>Tau&chkomponenten kopieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation>Tauchkom&ponenten einfügen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>&Neu nummerieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>Automatisch &gruppieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>Tauchgangliste</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>Informationen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>Alle</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation>Vorh. TC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation>Nächster TC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>Info zu Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation>Benutzerhandbuch</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>Tauchgang planen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>Protokolldateien &importieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>Tauchprotokolldateien von anderen Anwendungen importieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>&Von divelogs.de importieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>Vollbild</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>Vollbild Umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation>Nach neuer Version suchen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>Exportiere</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation>Logbücher exportieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation>&Tauchcomputer konfigurieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation>Tauchgang in Tauchgangs Planer b&earbeiten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation>pO₂-Plot umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation>pN₂-Plot umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>pHe-Kurve ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation>Auftauchgrenze Tauchcomputer ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation>Berechnete Auftauchgrenze ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation>Berechnung aller Gewebe ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Berechnete Auftauchgrenze in 3m Schritten ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>Pulsrate ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>MOD ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation>Nullzeit, Gesamtaufstiegszeit ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation>SAC Rate ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation>Lineal ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation>Massstabsgraph</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation>Bilder umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> - <translation>Tankleiste umschalten</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation>Liste der Tauchgänge filtern</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation>Gewebe-Heatmap</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation>Benutzer&umfrage</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>R&ueckgängig</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>Wiederholen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation>Verschobene Bilder &finden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation>Aus C&loud öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation>In Clo&ud speichern</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation>Tauchplätze verwalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation>Tauchplatz B&earbeitung</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation>Verbinden zum Cloud-Dienst</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Verbinden mit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Trennen von</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Bilder Verzeichnisse durchsuchen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Durchsuchen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>Durchsuche Bilder...(dies kann eine Weile dauern)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Warnung</translation> </message> @@ -4706,105 +4751,221 @@ Möchtest Du fortfahren?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Laufzeittabelle anzeigen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Es wird versucht, einen Tauchgang, der ursprünglich nicht im Planer erstellt wurde, im Planer zu öffnen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Versuche einenTauchgang zu bearbeiten der nicht manuell angelegt wurde.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>CSV</source> + <translation>CSV</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Möchtest Du Deine Änderungen in der Datendatei speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <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="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Datei speichern unter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[Lokaler Zwischenspeicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[Cloud Speicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>Datendatei von älterer Version wird geöffnet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Es wurde eine Datei von einer älteren Subsurface-Version geöffnet. Wir empfehlen das Handbuch zu lesen, um die Unterschiede der neuen Version insbesondere in der Tauchplatzverwaltung kennen zu lernen. Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die neue Tauchplatzverwaltung anzuschauen und sicher zu stellen, dass alles richtig aussieht. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Tauchprotokolldatei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation>Logbuchdateien (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de Dateien (*.dld *.DLD);;JDiveLog Dateien (*.jlb *.JLB);;Liquivision Dateien (*.lvd *.LVD);;MkVI Dateien (*.txt *.TXT);;Suunto Dateien (*.sde *.db *.SDE *.DB);;Divesoft Dateien (*.dlf *.DLF);;UDDF/UDCF Dateien (*.uddf *.udcf *.UDDF *.UDCF);;XML Dateien (*.xml *.XML);;APD log Betrachter (*.apd *.APD);;Datatrak/WLog Dateien (*.log *.LOG);;OSTCtools Dateien (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Alle Dateien (*)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>Kontaktiere Cloud Service...</translation> </message> @@ -4812,7 +4973,7 @@ Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4820,22 +4981,22 @@ Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4843,7 +5004,7 @@ Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4895,8 +5056,8 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> - <translation>Firmware Dateien (*.hex *.bin)</translation> + <source>Firmware files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4920,89 +5081,89 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Offenes System</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Letzter Stopp auf 20 Fuss</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% mitlerer Tiefe bis 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20ft bis Oberfläche</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Letzter Stopp auf 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% mitlerer Tiefe bis 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6m bis Oberfläche</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -5116,8 +5277,8 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5331,33 +5492,33 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen <translation>Datumsformat</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation><html><head/><body><p>Bevorzugtes Datumsformat. Gebräuchliche Felder sind </p><p>d (Tag im Monat)</p><p>ddd (Wochentagsabkürzung)</p><p>M (Monatszahl)</p><p>MMM (Abkürzung Monatsname)</p><p>yy/yyyy (2/4-stelliges Jahr)</p></body></html></translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation>Verwende Standardsprache</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation>Wird verwendet, wenn nicht genug Platz ist, das volle Datum zu zeigen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation>Kurzformat</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation>Zeitformat</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation><html><head/><body><p>Bevorzugtes Zeitformat</p><p>Übliche Felder sind</p><p>h (Stunden im 12h-Format)</p><p>H (Stunden im 24h-Format)</p><p>mm (zweistellige Minuten)</p><p>ss (zweistellige Sekunden)</p><p>t/tt (a/p oder am/pm)</p></body></html></translation> </message> @@ -5367,30 +5528,38 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen <translation>Sprache</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation>Bitte Programm neu starten</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Um die neue Sprache laden zu können, muss Subsurface neu gestartet werden.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation>Unübersetzte Zeichen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> - <translation>Zeichen ohne Bedeutung im Zeitformat. -Diese werden direkt übernommen, dies könnte nicht das beabsichtigte Verhalten sein, -siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5800,45 +5969,70 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and cannot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>Vorlagendatei importieren</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> - <translation>HTML Dateien (*.html)</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>Vorlagendateien exportieren als</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation>Diese Aktion kann nicht rückgängig gemacht werden!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>Vorlage löschen: %1?</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation type="unfinished"/> </message> </context> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (#%1 von %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Unbekannter Tauchcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Null-/Auftauchzeitberechnung wegen Zeitüberschreitung abgebrochen</translation> </message> @@ -5848,22 +6042,17 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Gaswechsel setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation> (Tank %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Als ersten Tauchcomputer setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> @@ -5873,6 +6062,11 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Diesen Tauchcomputer entfernen</translation> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation> (Fl. %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>CC Setpoint-Wechsel setzen</translation> @@ -5905,8 +6099,8 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> - <translation>Druck in Flasche %1 (momentan zu %2 interpoliert)</translation> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> @@ -5952,147 +6146,147 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation>Starten...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation>ohne Cloud-Anbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation>Keine Cloud-Benutzerdaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation>Bitte gültige Cloud-Benutzerdaten eingeben.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Cloud Email und Passwörter können nur Buchstaben, Zahlen und folgende Sonderzeichen enthalten . - _ + </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Versuche Cloud mit neuen Benutzerdaten zu öffnen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation>Überprüfe Could-Benutzerdaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation>Keine Antwort vom Cloud-Server zur Überprüfung der Benutzerdaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Keine Verbindung zum Cloud-Server - Cloud-Account nicht bestätigt</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation>Cloud-Benutzerdaten ungültig</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Kann den Cloud-Speicher nicht öffnen: Fehler beim Erstellen der https-Verbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation>Kann den Cloud-Speicher nicht öffnen: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation>Kann nicht zum Cloud-Speicher verbinden</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation>Cloud-Speicher-Fehler: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Verbindung zum Cloud-Server fehlgeschlagen, Fortsetzung ohne Cloud-Verbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Cloudspeicher erfolgreich geöffnet. Keine Tauchgänge in der Tauchgangsliste.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> <translation>Unbekannte GPS-Position</translation> </message> @@ -6190,7 +6384,7 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6198,7 +6392,7 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation>h</translation> </message> @@ -6206,7 +6400,7 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation>sec</translation> </message> @@ -6532,7 +6726,7 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> + <source>Image files</source> <translation type="unfinished"/> </message> <message> @@ -6646,8 +6840,8 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> - <translation>Nachrichten (Fehlermeldungen, Warnungen usw.) importieren</translation> + <source>Import messages (errors, warnings, etc)</source> + <translation type="unfinished"/> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/> @@ -6656,81 +6850,87 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> - <translation>SmartTrak Dateien (*.slg *.SLG);;Alle Dateien (*)</translation> + <source>SmartTrak files</source> + <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> - <translation>Subsurface Dateien öffnen</translation> + <source>All files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> - <translation>Subsurface Dateien (*.ssrf *SSRF *.xml *.XML);;Alle Dateien (*)</translation> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> + <translation>Subsurface Dateien öffnen</translation> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation>Mittel</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation>Tauchdatum: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation>Dauer: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation>Tauchplatz: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation>Partner: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation>Tauchgruppenleiter: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation> @@ -6925,7 +7125,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation>Kein Anzug eingetragen</translation> </message> @@ -7051,32 +7251,32 @@ Files with inappropriate date/time</source> <translation>Bilder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Bilde(r) von Datei(en) laden</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Bild(er) aus Internet laden</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>Ausgewählte Bilder löschen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>Alle Bilder Löschen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>Bilder löschen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>Wirklich alle Bilder löschen?</translation> </message> @@ -7254,7 +7454,7 @@ den folgenden Gasen gemischt werden: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>Leere Tags</translation> </message> @@ -7658,24 +7858,24 @@ den folgenden Gasen gemischt werden: <translation>Der Server hat die folgenden Informationen zurückgegeben:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface prüft alle zwei Wochen, ob eine neue Version zur Verfügung steht. Wenn Subsurface dies nicht tun soll, bitte ablehnen.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Ablehnen</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Annehmen</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Automatisch nach Aktualisierungen suchen</translation> </message> @@ -7937,8 +8137,8 @@ Sprache: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation>Kein Fehler</translation> </message> @@ -8062,21 +8262,12 @@ Durchschnitt</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation>Fehler beim Lesen der Kopfdaten</translation> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8407,8 +8598,8 @@ Durchschnitt</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>Sauerstoff</translation> </message> @@ -8493,15 +8684,10 @@ Durchschnitt</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> - <source>(%s) or (%s)</source> - <translation>(%s) oder (%s)</translation> - </message> - <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>Luft</translation> </message> @@ -8511,27 +8697,27 @@ Durchschnitt</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>integriert</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>Gürtel</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>Fussblei</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation>Backplate</translation> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8714,23 +8900,23 @@ Durchschnitt</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Fehler beim Verbinden mit dem Subsurface Cloud Speicher</translation> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation>GIT Clone von %s ist gescheitert (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>unbekannt</translation> @@ -8872,75 +9058,75 @@ Durchschnitt</translation> <translation>Fehler beim Lesen des Gasgemischs</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <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="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Fehler beim Registrieren der Daten</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Fehler beim Lesen der Samples</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Ereignis: warte auf Benutzeraktion</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Fehler beim Registrieren der Ereignisbehandlung</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Fehler beim Importieren der Tauchgangsdaten</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Fehler beim Öffnen von %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>mehrere GPS Koordinaten für diesen Tauchplatz; ebenso %s @@ -8948,19 +9134,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation>Zusätzlicher Name für Tauchplatz: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -8976,19 +9162,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Fehler - %s - beim Analysieren von Tauchgang %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation>Unverständliche Prozentangabe %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation>Fehler beim Lesen von '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation>Kann Stylesheet %s nicht öffnen</translation> </message> @@ -9007,8 +9193,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation>Warnung:</translation> </message> @@ -9034,16 +9220,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime: %dmin<br></div></translation> @@ -9146,6 +9322,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>SAC</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9168,6 +9359,16 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Plan</b> erstellt am</translation> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekomodell: Bühlmann ZHL-16C mit GF niedrig = %d%% und GF hoch = %d%%</translation> @@ -9213,22 +9414,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Erforderliches Minimum Gas überschreitet bereits den Anfangsdruck der Flasche!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s von <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s im berechneten Aufstieg)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation>%.0f%s (%.0f%s im berechneten Aufstieg) von <span style='color: red;'><b>%s</b></span></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <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="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>niedriger pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation> </message> @@ -9238,12 +9434,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Kann Gas %s nicht finden</translation> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9252,251 +9448,257 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Sicherheitsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1427"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Sicherheitsstopp: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deko: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation>In Deko </translation> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation>Nullzeit: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>Gesamtaufstiegszeit: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation>Deko (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation>Nullzeit: %umin (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation>Nullzeit: > 2h (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>Gesamtaufstiegszeit: %umin (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation>Gesamtaufstiegszeit: >2h (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation>Restgrundzeit: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation>Berechneter tiefster Deko-Stopp %.0f %s </translation> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Gewebe %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation>Puslrate: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation>Peilung: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation>Durchschnittstiefe bis hier %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation>%s %sTiefe:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation>%s %sTiefe:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation>%s %sDruck:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation>%s SAC: %.*f %s</translation> </message> @@ -10361,22 +10563,22 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Stadt</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1237"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> @@ -10389,117 +10591,117 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation>Tauchgangliste</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation>Tauchgang hinzufügen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>Manuelle Cloud-Synchronisation</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation>Offline-Modus</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation>Automatische Synchronisation</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation>Hilfe</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation>GPS-Daten hochladen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation>GPS Positionen anwenden</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>GPS-Daten herunterladen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation>GPS-Positionen anzeigen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation>GPS-Speicher löschen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation>Entwickler</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation>App-Protokoll</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation>Theme-Information</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation>Über</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation>Ortungsdienst starten</translation> </message> @@ -10602,51 +10804,56 @@ p, li { white-space: pre-wrap; } <translation>Planung</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation>VPM-B Deko</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation>Bühlmann Deko</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation>Reserve Gas</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation>Gaswechsel verschieben wenn ein Stop nicht benötigt wird</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation>Nur an benötigten Stops wechseln</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation>Plane backgas Pausen</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>min</translation> </message> @@ -10666,153 +10873,153 @@ p, li { white-space: pre-wrap; } <translation>Sporttaucher Modus</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation>Direkter Abstieg zur ersten Tiefe</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> - <translation>Min. Schaltdauer</translation> - </message> - <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> <source>Safety stop</source> <translation>Sicherheitsstopp</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> <source>Conservatism level</source> <translation>Sicherheitslevel</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> + <translation>Tauchmodus</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation>Gas Optionen</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation>SAC Faktor</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation>Wird für die Minimum Gas Berechnung verwendet. Bitte zwei Taucher mit möglicherweise erhöhtem AMV nach Gasverlust berücksichtigen!</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation>Zeit für Problemlösung</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation>Wird für die Minimum Gas Berechnung verwendet. Maximale zusätzliche Zeit auf maximaler Tiefe nach Gasverlust bei einem Partner.</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation>Wird zur Best-Mix-Berechnung verwendet. Best-Mix kann in der "Verfügbare Gase"-Tabelle ausgewählt werden, indem hinter der Tiefe "B" (für Trimix-Best-Mix) oder "BN" (für Nitro-Best-Mix) angegeben wird.</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>GF niedrig</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>GF hoch</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation>Grund pO₂</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation>Best-Mix END</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Notizen</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>Zeige runtime (absolute Zeit) der Stopps im Tauchplan</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation>Zeige runtime</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>Zeige Dauer (relative Zeit) der Stopps im Tauchplan.</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation>Zeige Segmentdauer</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>Zeige Aufstiege im Tauchplen oder behandle sie als implizit</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation>Aufstiege in der Deko anzeigen</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation>Ausführlicher Tauchplan</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation>Deko pO₂</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation>Deko SAC</translation> </message> diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts index 218d64942..af943539e 100644 --- a/translations/subsurface_de_DE.ts +++ b/translations/subsurface_de_DE.ts @@ -2577,76 +2577,76 @@ Position verwenden</translation> <translation>Schreibe den Tauchgang als TeX-Makros in Datei.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>UDDF-Datei exportieren als</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> <source>UDDF files</source> <translation>UDDF Dateien</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> <source>CSV files</source> <translation>CSV Dateien</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> <source>HTML files</source> <translation>HTML Dateien</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> <source>Subsurface files</source> <translation>Subsurface Dateien</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>TeX files</source> <translation>TeX Dateien</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>Export CSV file as</source> <translation>CSV-Datei exportieren als</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export world map</source> <translation>Weltkarte exportieren</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> <source>Export Subsurface XML</source> <translation>Exportiere Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Tiefe speichern, in der das Bild aufgenommen wurde</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Export in TeX-Datei</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>HTML-Datei exportieren als</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Bitte warten, Exportiervorgang...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Kann Datei %s nicht öffnen</translation> </message> @@ -2987,41 +2987,61 @@ Position verwenden</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="157"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="192"/> - <location filename="../qt-models/diveplannermodel.cpp" line="277"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation>Fl.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Endtiefe</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Verw. Gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="381"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>CC Setpoint</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation>Stopp Zeiten</translation> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3607,7 +3627,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Herunterladen</translation> </message> @@ -3633,7 +3653,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> @@ -3663,37 +3683,37 @@ p, li { white-space: pre-wrap; } <translation> Verbindung:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Wiederholen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Beenden</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>Ausgelesene Tauchgänge</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Annehmen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Alles auswählen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Alle abwählen</translation> </message> @@ -4618,13 +4638,13 @@ Trotzdem fortfahren?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>&Rückgängig</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>&Wiederherstellen</translation> </message> @@ -4664,20 +4684,20 @@ Trotzdem fortfahren?</translation> <translation>Verbinden zum Cloud-Dienst</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="371"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="407"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Verbinden mit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="401"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Trennen von</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1593"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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> @@ -4688,39 +4708,39 @@ Trotzdem fortfahren?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="629"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation>Kein leeres Logbuch in der Cloud speichern</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="670"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Bildverzeichnisse durchsuchen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Durchsuchen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>Bilder werden gesucht...(dies kann eine Weile dauern)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="707"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="858"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="968"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Warnung</translation> </message> @@ -4730,12 +4750,12 @@ Trotzdem fortfahren?</translation> <translation>Es wird versucht, Tauchgänge mit %1min Oberflächenpause zusammenzuführen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> <source>Template backup created</source> <translation>Sicherungskopie der Druckvorlage erstellt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>The following backup printing templates were created: %1 @@ -4756,202 +4776,202 @@ Pfad: Die Druckvorlagen in dieser Subsurface Version sind schreibgeschützt und sollten nicht verändert werden, da neuere Versionen von Subsurface diese überschreiben könnten.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="732"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="858"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="910"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Runtimetabelle anzeigen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="968"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Es wird versucht, einen Tauchgang, der ursprünglich nicht im Planer erstellt wurde, im Planer zu öffnen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Es wird versucht, einen nicht Tauchgang, der nicht manuell erstellt wurde, zu editieren.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1110"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1331"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> <source>Dive log files</source> <translation>Logbuch Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1622"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> <source>Subsurface files</source> <translation>Subsurface Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> <source>MkVI files</source> <translation>MkVI Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> <source>APD log viewer</source> <translation>APD Log Viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> <source>All files</source> <translation>Alle Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <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="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <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="../desktop-widgets/mainwindow.cpp" line="1621"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Datei speichern unter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1709"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[Lokaler Zwischenspeicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1711"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[Cloud-Speicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1812"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>Datendatei von älterer Version wird geöffnet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1813"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Es wurde eine Datei von einer älteren Subsurface-Version geöffnet. Wir empfehlen das Handbuch zu lesen, um die Unterschiede der neuen Version insbesondere in der Tauchplatzverwaltung kennen zu lernen. Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die neue Tauchplatzverwaltung anzuschauen und sicher zu stellen, dass alles richtig aussieht. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Logbuchdatei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>Kontaktaufnahme mit dem Cloud-Dienst...</translation> </message> @@ -5068,89 +5088,89 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Offenes System</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Letzter Stopp auf 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% mittlerer Tiefe bis 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20ft bis Oberfläche</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Letzter Stopp auf 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% mittlerer Tiefe bis 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6m bis Oberfläche</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>cft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -6013,17 +6033,17 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (#%1 von %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Unbekannter Tauchcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Null-/Auftauchzeitberechnung wegen Zeitüberschreitung abgebrochen</translation> </message> @@ -6038,12 +6058,12 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> <translation>Als ersten Tauchcomputer setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation>Geplanter Tauchgang</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation>Manuell hinzugefügter Tauchgang</translation> </message> @@ -7243,32 +7263,32 @@ Dateien mit unpassendem Datum/Zeit</translation> <translation>Bilder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Bild(er) aus Datei(en) laden</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Bild(er) aus Web laden</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>Ausgewählte Bilder löschen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>Alle Bilder Löschen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>Bilder löschen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>Wirklich alle Bilder löschen?</translation> </message> @@ -7850,24 +7870,24 @@ den folgenden Gasen gemischt werden: <translation>Der Server hat die folgenden Informationen zurückgegeben:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface überprüft alle zwei Wochen, ob eine aktuellere Version verfügbar ist. Soll das nicht passieren, bitte "Ablehnen" klicken.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Ablehnen</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Annehmen</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Automatisch nach Aktualisierungen suchen</translation> </message> @@ -8591,8 +8611,8 @@ Durchschnitt</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1144"/> - <location filename="../core/planner.c" line="1147"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>Sauerstoff</translation> </message> @@ -8679,8 +8699,8 @@ Durchschnitt</translation> <message> <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1140"/> - <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>Luft</translation> </message> @@ -9215,11 +9235,6 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation>Runtime: %dmin %s</translation> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime: %dmin<br></div></translation> @@ -9364,6 +9379,11 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans <translation>Plan</b> (überlappende Tauchgänge erkannt)</translation> </message> <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation>Runtime: %dmin%s</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekomodell: Bühlmann ZHL-16C mit GF niedrig = %d%% und GF hoch = %d%%</translation> @@ -9429,7 +9449,7 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans <translation>Kann Gas %s nicht finden</translation> </message> <message> - <location filename="../core/planner.c" line="1148"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> @@ -10627,11 +10647,6 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Von Tauchcomputer herunterladen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="156"/> - <source>Apply GPS Fixes</source> - <translation>GPS-Korrekturen anwenden</translation> - </message> - <message> <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>Manuelle Cloud-Synchronisation</translation> @@ -10667,6 +10682,11 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>GPS-Daten hochladen</translation> </message> <message> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation>GPS Positionen anwenden</translation> + </message> + <message> <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>GPS-Daten herunterladen</translation> @@ -10674,7 +10694,7 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> - <translation>GPS-Korrekturen anzeigen</translation> + <translation>GPS-Positionen anzeigen</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="227"/> diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts index 14dd9d243..4ee956e1d 100644 --- a/translations/subsurface_el_GR.ts +++ b/translations/subsurface_el_GR.ts @@ -46,66 +46,86 @@ <translation>Επιλογή απομακρυσμένης συσκευής Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Συσκευές που έχουν βρεθεί</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Αποθήκευση</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Παραίτηση</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Σάρωση</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Εκκαθάριση</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Λεπτομέρειες τοπικής συσκευής Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Όνομα:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Διεύθυνση:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth σε λειτουργία</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Ανοικτό/Κλειστό</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Επιλογή συσκευής:</translation> @@ -116,22 +136,22 @@ <translation>Όνομα:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation>Δεν μπορεί να αρχικοποιηθεί η έκδοση 2.2 του Winsock</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation>Προσπάθεια να ανοίξει η τοπική συσκευή Bluetooth...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation>Προσπάθεια να κλείσει η τοπική συσκευή Bluetooth...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation>Ο κατάλογος απομακρυσμένων συσκευών εκκαθαρίστηκε.</translation> </message> @@ -163,22 +183,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation>ΜΗ ΣΥΖΕΥΓΜΕΝΟ</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation>ΣΥΖΕΥΓΜΕΝΟ</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation>ΕΞΟΥΣΙΟΔΟΤΗΜΕΝΟ_ΣΥΖΕΥΓΜΕΝΟ</translation> </message> @@ -188,113 +208,113 @@ <translation>%1 (%2) [Κατάσταση: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Η συσκευή %1 μπορεί να χρησιμοποιηθεί για σύνδεση. Μπορείτε να πιέσετε το κουμπί Αποθήκευση.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Η συσκευή %1 πρέπει να συζευχθεί ώστε να χρησιμοποιηθεί. Παρακαλώ χρησιμοποιείστε τον αρχικό κατάλογο για επιλογές σύζευξης.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation>Η τοπική συσκευή τροποποιήθηκε. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation>Σύζευξη</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation>Απομάκρυνση σύζευξης</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation>Προσπάθεια σύζευξης συσκευής %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation>Προσπάθεια αποσύζευξης συσκευής %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation>Η συσκευή %1 αποσυζεύχθηκε</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation>Η συσκευή %1 συζεύχθηκε</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation>Η συσκευή %1 συζεύχθηκε και έχει εξουσιοδοτηθεί</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Η συσκευή %1 μπορεί πλέον να χρησιμοποιηθεί για σύνδεση. Μπορείτε να πιέσετε το κουμπί Αποθήκευση.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation>Σφάλμα τοπικής συσκευής: %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Σφάλμα σύζευξης. Αν η απομακρυσμένη συσκευή απαιτεί έναν συγκεκριμένο κωδικό PIN, προσπαθήστε να συζεύξετε την συσκευή χρησιμοποιώντας το λειτουργικό σας σύστημα. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation>Άγνωστο σφάλμα</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Ο προσαρμογέας Bluetooth είναι κλειστός, ανοίξτε τον πριν προβείτε σε εύρεση.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Η εγγραφή ή η ανάγνωση από την συσκευή οδήγησε σε σφάλμα. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation>Προέκυψε ένα άγνωστο σφάλμα.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation>Σφάλμα εύρεσης συσκευής: %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>Μη διαθέσιμο</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Ο τοπικός προσαρμογέας Bluetooth δεν είναι προσβάσιμος.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Ο παράγοντας εύρεσης της συσκευής δεν δημιουργήθηκε διότι η διεύθυνση %1 δεν συμπίπτει με την φυσική διεύθυνση προσαρμογέα οποιασδήποτε τοπικής συσκευής Bluetooth. </translation> </message> @@ -315,7 +335,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>Χωρίς καταδυτικό ζευγάρι</translation> </message> @@ -1635,82 +1655,82 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Δημιουργία αντιγράφου ασφαλείας ρυθμίσεων καταδυτικού υπολογιστή </translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> - <translation>Αρχεία αντιγράφων ασφαλείας (*.xml)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>Σφάλμα αντιγραφής ασφαλείας XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>Εμφανίστηκε σφάλμα κατά την αποθήκευση του αρχείου αντιγράφου ασφαλείας %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Η δημιουργία αντιγράφου ασφαλείας πέτυχε </translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>Οι ρυθμίσεις αποθηκεύτηκαν στο : %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Επαναφορά ρυθμίσεων καταδυτικού υπολογιστή </translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>Σφάλμα επαναφοράς XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Εμφανίστηκε σφάλμα κατά την επαναφορά του αρχείου αντιγράφου ασφαλείας %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>Η επαναφορά πέτυχε</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>Οι ρυθμίσεις επαναφέρθηκαν με επιτυχία</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Επιλογή αρχείου υλικολογισμικού</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> - <translation>Όλα τα αρχεία (*.*)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> - <translation>Αρχεία καταγραφής (*.log)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1790,27 +1810,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>Πατώντας εδώ θα διαγραφεί αυτή η φιάλη</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Βάθος αλλαγής σε μείγμα αποσυμπίεσης. Υπολογίστηκε χρησιμοποιώντας την pO₂ του μείγματος αποσυμπίεσης, εκτός αν ορίστηκε μη αυτόματα.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Αυτό το μείγμα χρησιμοποιείται. Μόνο φιάλες που δεν χρησιμοποιούνται στην κατάδυση μπορούν να διαγραφούν.</translation> </message> @@ -1923,27 +1943,27 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation>Λεπτομέρειες κατάδυσης </translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Διαγραφή κατάδυσης</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation>Προβολή στον χάρτη</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation>Πολλαπλοί καταδυτικοί σύντροφοι </translation> </message> @@ -1951,103 +1971,103 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation>Κατάδυση %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Ημερομηνία:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Τοποθεσία:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation>Συντεταγμένες:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation>Χρήση τρέχουσας θέσης GPS:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Βάθος:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Διάρκεια:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Θερμοκρασία Ατμόσφαιρας:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Θερμοκρασία Νερού:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Στολή:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Καταδυτικό ζευγάρι:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Βάρος:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation>Φιάλη:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation>Μείγμα αερίου:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation>Πίεση στην αρχή:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation>Πίεση στο τέλος:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Βαθμός:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Σημειώσεις:</translation> </message> @@ -2123,23 +2143,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation>(φιάλη %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>Μη αυτόματη μετάπτωση σε ανοικτό κύκλωμα </translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation>έναρξη</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation>λήξη</translation> @@ -2304,12 +2324,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Δημιουργία μίας νέας θέσης κατάδυσης, αντιγράφοντας τις σχετικές πληροφορίες από την τρέχουσα κατάδυση.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation>Δημιουργία νέας θέσης κατάδυσης με αυτό το όνομα </translation> </message> @@ -2554,76 +2574,76 @@ GPS location:</source> <translation>Εγγραφή κατάδυσης ως μακροεντολή TeX σε αρχείο.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Εξαγωγή αρχείου UDDF ως</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>UDDF αρχεία (*.uddf *.UDDF)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <source>UDDF files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> - <translation>Εξαγωγή αρχείου CSV ως</translation> + <source>CSV files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>Αρχεία CSV (*.csv *.CSV)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <source>HTML files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> - <translation>Εξαγωγή παγκόσμιου χάρτη</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>Αρχεία HTML (*.html)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>TeX files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> - <translation>Εξαγωγή Subsurface XML</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <source>Export CSV file as</source> + <translation>Εξαγωγή αρχείου CSV ως</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>Αρχεία XML (*.xml *.ssrf)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <source>Export world map</source> + <translation>Εξαγωγή παγκόσμιου χάρτη</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <source>Export Subsurface XML</source> + <translation>Εξαγωγή Subsurface XML</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Αποθήκευση βάθους λήψης των εικόνων</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Εξαγωγή σε αρχείο TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> - <translation>Αρχεία TeX (*.tex)</translation> - </message> - <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Εξαγωγή αρχείου HTML ως</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Παρακαλώ περιμένετε, γίνεται εξαγωγή...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Αδυναμία ανοίγματος του αρχείου %s </translation> </message> @@ -2918,7 +2938,7 @@ GPS location:</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation>Πολλαπλοί καταδυτικοί σύντροφοι </translation> </message> @@ -2964,41 +2984,61 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>άγνωστο</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Τελικό Βάθος</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Χρόνος από την έναρξη της κατάδυσης</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Διάρκεια</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Μείγμα χρήσης</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>Καθορισμένη Τιμή Κλειστού Κυκλώματος</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>λεπτά</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3031,107 +3071,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Βάθος</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Ώρα</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Πίεση</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Θερμοκρασία</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Χρώμα</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Εισαγωγή από χρήστη</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Πίεση S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Πίεση I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Βάθος ασφαλούς ανάδυσης</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>Κατανάλωση Αέρα στην Επιφάνεια</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Καθορισμένη Τιμή</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Αισθητήρας 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Αισθητήρας 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Αισθητήρας 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Πίεση περιβάλλοντος</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>Καρδιακοί παλμοί</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>Αναλογικός συντελεστής αποσυμπίεσης</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>Μέσος όρος βάθους @ s</translation> </message> @@ -3450,71 +3490,71 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Λήψη</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation>Επιλέξτε τρόπο λήψης πρωτοκόλλου Bluetooth </translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Σφάλμα</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Εύρεση καταδυτικού υπολογιστή UEMIS</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> - <translation>Log files (*.log)</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Προειδοποίηση</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Saving the libdivecomputer dump will NOT download dives to the dive list.</translation> </message> - <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> - <translation>Dump files (*.bin)</translation> - </message> </context> <context> <name>DownloadFromDiveComputer</name> @@ -3583,7 +3623,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Λήψη</translation> </message> @@ -3609,7 +3649,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Ακύρωση</translation> </message> @@ -3639,37 +3679,37 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Επαναπροσπάθεια</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Παραίτηση</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>Ληφθείσες καταδύσεις</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Αποδοχή</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Επιλογή όλων</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Αποεπιλογή Όλων</translation> </message> @@ -3700,12 +3740,12 @@ p, li { white-space: pre-wrap; } <translation>Σύνδεση με το κείμενο δοκιμής του Facebook </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Για να αποσυνδέσετε το Subsurface από τον λογαριασμό σας στο Facebook, χρησιμοποιήστε την επιλογή του καταλόγου 'Κοινοποίηση'.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Για να συνδεθείτε με το Facebook, παρακαλώ εισάγεται τα διαπιστευτήριά σας. Αυτό επιτρέπει στο Subsurface να δημοσιεύσει καταδύσεις στο χρονολόγιό σας</translation> </message> @@ -3899,7 +3939,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation>Δεν καθορίσθηκε τοποθεσία</translation> </message> @@ -3956,6 +3996,11 @@ p, li { white-space: pre-wrap; } <source>Country</source> <translation>Χώρα</translation> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> + <translation type="unfinished"/> + </message> </context> <context> <name>LocationInformationModel</name> @@ -3979,29 +4024,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation>Διαχείριση θέσης κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> <translation>Συγχώνευση στην παρούσα θέση κατάδυσης </translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> <translation>Συγχώνευση θέσεως κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation>Πρόκειται να συγχωνεύσετε θέσεις κατάδυσης και μετά δεν θα μπορείτε να αναιρέσετε την υπόψη ενέργεια. Είστε βέβαιος ότι θέλετε να συνεχίσεται; </translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation>Επεξεργάζεστε μία θέση κατάδυσης </translation> </message> @@ -4019,8 +4064,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>Σημειώσεις</translation> </message> @@ -4041,19 +4086,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>Θερμοκρασία Ατμόσφαιρας</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>Θερμοκρασία Νερού</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>Τοποθεσία</translation> </message> @@ -4118,123 +4163,123 @@ p, li { white-space: pre-wrap; } <translation>Διάρκεια</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>Πληροφορίες</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation>Στατιστικά στοιχεία</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>Φωτογραφίες</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation>Εφαρμογή αλλαγών</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation>Απόρριψη αλλαγών</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>Φιάλες</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation>Προσθήκη φιάλης</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>Βάρη</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation>Προσθήκη συστήματος βαρών</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation>Ανοικτού Κυκλώματος </translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation>Κλειστό κύκλωμα επαναπνοής</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation>Παθητικό ημίκλειστο κύκλωμα επαναπνοής </translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation>Ελεύθερη κατάδυση</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>Θερμοκρασία ατμόσφαιρας [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>Θερμοκρασία νερού [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>Το ταξίδι αυτό επεξεργάζεται αυτή τη στιγμή.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>Πολλαπλές καταδύσεις επεξεργάζονται αυτή τη στιγμή.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>Η κατάδυση επεξεργάζεται αυτή τη στιγμή.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>Σημειώσεις ταξιδιού</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>Τοποθεσία ταξιδιού</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation>Νέα θέση κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>Απόρριψη των αλλαγών;</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation>Πρόκειται να απορρίψετε τις αλλαγές σας. </translation> </message> @@ -4247,451 +4292,451 @@ p, li { white-space: pre-wrap; } <translation>&File</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>&View</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>&Help</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>&Import</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation>&Επεξεργασία</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> <translation>Κοινοποίηση</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>&New logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>Νέο</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>&Open logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>Άνοιγμα</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>&Save</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>Αποθήκευση</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>Αποθήκευση ως</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>Αποθήκευση ως...</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>Έ&ξοδος</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>Κλείσιμο</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>Εκτύ&πωση</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>Προτιμήσεις</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>Έ&ξοδος</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>Εισαγωγή από &υπολογιστή κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>Εισαγωγή δεδομένων &GPS από την υπηρεσία διαδικτύου του Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> <translation>Επεξεργασία συσκευής & ονομάτων</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>&Προσθήκη κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation>&Επεξεργασία κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation>&Αντιγραφή στοιχείων κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation>&Επικόλληση στοιχείων κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>Επ&αναρίθμηση</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>Αυτόματη &ομαδοποίηση</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>&Ετήσια στατιστικά στοιχεία</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>&Κατάλογος καταδύσεων</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>&Γράφημα</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>&Πληροφορίες</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>&Όλα</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation>Προηγούμενος καταδυτικός υπολογιστής</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation>Επόμενος καταδυτικός υπολογιστής </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>Σχετικά με το Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation>Εγχειρίδιο &χρήσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>Σχεδιασμός κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>Εισαγωγή αρχείων καταγραφής</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>Εισαγωγή αρχείων λογισμικού καταχώρησης καταδύσεων από άλλες εφαρμογές</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>Εισαγωγή από το divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>Πλήρης οθόνη</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>Εμφάνιση πλήρους οθόνης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation>Έλεγχος για ενημερώσεις</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>Εξαγωγή</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation>Εξαγωγή αρχείων καταγραφής κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation>Διαμόρφωση καταδυτικού υπολογιστή</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation>Επεξεργασία κατάδυσης στον σχεδιαστή</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation>Εμφάνιση γραφήματος pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation>Εμφάνιση γραφήματος pΝ₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>Εμφάνιση γραφήματος pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation>Εμφάνιση βάθους ασφαλούς ανάδυσης από τον καταδυτικό υπολογιστή</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation>Εμφάνιση υπολογισμένου βάθους ασφαλούς ανάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation>Εμφάνιση υπολογισμού όλων των ιστών</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Εμφάνιση υπολογισμένου βάθους ασφαλούς ανάδυσης με επαυξήσεις 3 μέτρων</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>Εμφάνιση καρδιακών παλμών</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>Εμφάνιση μέγιστου λειτουργικού βάθους</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>Εμφάνιση Ισοδύναμου Βάθους Αέρα, Ισοδύναμου Βάθους Νάρκωσης και Ισοδύναμου Βάθους Πυκνότητας Αέρα </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation>Εμφάνιση Ορίου Μη Αποσυμπίεσης, Συνολικού Χρόνου Μέχρι την Επιφάνεια </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation>Εμφάνιση ρυθμού Κατανάλωσης Αέρα στην Επιφάνεια</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation>Εμφάνιση χάρακα</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation>Κλιμάκωση γραφήματος</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation>Εμφάνιση εικόνων</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> - <translation>Εμφάνιση αλλαγών φιάλης</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation>Εισαγωγή φίλτρου στον κατάλογο καταδύσεων</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation>Εμφάνιση αποτύπωσης θερμοκρασίας ιστών</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation>Ερωτηματολόγιο χρήστη</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>Αναίρεση</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>Άρση αναίρεσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation>Εύρεση εικόνων που μετακινήθηκαν</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation>Άνοιγμα αποθηκευτικού νέφους </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation>Αποθήκευση στο αποθηκευτικό νέφος </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation>Διαχείριση θέσεων κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation>Επεξεργασία θέσης κατάδυσης </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation>Θέση του αποθηκευτικού νέφους σε σύνδεση </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Σύνδεση με</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Αποσύνδεση από</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν ανοίξετε ένα νέο αρχείο.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>Άνοιγμα αρχείου</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Ακύρωση</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Εξερεύνηση αρχείων εικόνων</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Σάρωση</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>Σάρωση εικόνων...(αυτή η ενέργεια μπορεί να καθυστερήσει) </translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Προειδοποίηση</translation> </message> @@ -4701,105 +4746,221 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν κλέισετε το αρχείο.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν προσπαθήσετε να προσθέσετε μια κατάδυση.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Εκτύπωση πίνακα ολικού χρόνου κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Προσπάθεια να επανασχεδιαστεί μία κατάδυση που δεν ήταν μια σχεδιασμένη κατάδυση. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Παρακαλώ πρώτα τελειώστε την τρέχουσα επεξεργασία πριν προσπαθήσετε να επεξεργαστείτε εκ νέου. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Προσπάθεια επεξεργασίας μια κατάδυσης που δεν προστέθηκε με μη αυτόματο τρόπο. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Ετήσια στατιστικά στοιχεία</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>CSV</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Θέλετε να αποθηκευτούν οι αλλαγές στο αρχείο %1;</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Θέλετε να αποθηκευθούν οι αλλαγές στο αρχείο δεδομένων;</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Αποθήκευση αλλαγών;</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <source>Changes will be lost if you don't save them.</source> <translation>Οι αλλαγές θα χαθούν αν δεν τις αποθηκεύσετε.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Αποθήκευση αρχείου ως</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[τοπική κρυφή μνήμη για] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[αποθήκευση στο αποθηκευτικό νέφος για] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>Άνοιγμα αρχείου δεδομένων από παλαιότερη έκδοση </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Ανοίξατε ένα αρχείο δεδομένων μίας παλαιότερης έκδοσης του Subsurface. Προτείνεται να συμβουλευτείτε το εγχειρίδιο χρήσης για να μάθετε για τις διαφοροποιήσεις της καινούργιας έκδοσης, ιδιαίτερα στην διαχείριση των καταδυτικών θέσεων η οποία έχει αλλάξει σε μεγάλο βαθμό. Το Subsurface ήδη επιχείρησε να συμπληρώσει τα δεδομένα, αλλά προτείνεται να αφιερώσετε κάποιο χρόνο στο νέο σύστημα διαχείρισης των καταδυτικών θέσεων και να βεβαιωθείτε ότι όλα είναι σωστά.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Άνοιγμα αρχείου καταγραφής κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation>Αρχεία καταγραφής κατάδυσης (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Αρχεία Cochran (*.can *.CAN);;Αρχεία CSV (*.csv *.CSV);;Αρχεία DiveLog.de (*.dld *.DLD);;Αρχεία JDiveLog (*.jlb *.JLB);;Αρχεία Liquivision (*.lvd *.LVD);;Αρχεία MkVI (*.txt *.TXT);;Αρχεία Suunto (*.sde *.db *.SDE *.DB);;Αρχεία Divesoft (*.dlf *.DLF);;Αρχεία UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;Αρχεία XML (*.xml *.XML);;Προβολέας αρχείων καταγραφής APD (*.apd *.APD);;Αρχεία Datatrak/WLog (*.log *.LOG);;Αρχεία OSTCtools (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Όλα τα αρχεία (*)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>Επικοινωνία με την υπηρεσία αποθηκευτικού νέφους... </translation> </message> @@ -4807,7 +4968,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4815,22 +4976,22 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4838,7 +4999,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4890,8 +5051,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> - <translation>Αρχεία υλικολογισμικού (*.hex *.bin)</translation> + <source>Firmware files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4915,89 +5076,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Ανοιχτό κύκλωμα </translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>Κλειστό κύκλωμα επαναπνοής</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>Παθητικό ημίκλειστο κύκλωμα επαναπνοής </translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Τελευταία στάση στα 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>Ταχύτητα ανόδου από το 50% του μέσου βάθους στα 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20ft για την επιφάνεια</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Τελευταία στάση στα 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>Ταχύτητα ανόδου από το 50% του μέσου βάθους στα 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6m για την επιφάνεια</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -5111,8 +5272,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5326,33 +5487,33 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Μορφή ημερομηνίας</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation><html><head/><body><p>Προτιμούμενη μορφή ημερομηνίας. Συνήθεις χρησιμοποιούμενα πεδία είναι </p><p>d (ημέρα του μήνα)</p><p>ddd (συντμημένο όνομα της ημέρας)</p><p>M (αριθμός μήνα)</p><p>MMM (συντμημένο όνομα του μήνα)</p><p>yy/yyyy (2/4 ψηφία για το έτος)</p></body></html></translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation>Χρήση προεπιλογής γλώσσας διεπαφής χρήστη</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation>Χρησιμοποιείται όταν υπάρχει λιγότερος χώρος για την προβολή της ημερομηνίας πλήρης</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation>Σύντομη μορφή</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation>Μορφή ώρας</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation><html><head/><body><p>Προτιμούμενη μορφή ώρας</p><p>Συνήθεις χρησιμοποιούμενοι επεξηγητές μορφής είναι </p><p>h (ώρες σε μορφή 12ώρου)</p><p>H (ώρες σε μορφή 24ώρου)</p><p>mm (2 ψηφία για τα λεπτά)</p><p>ss (2 ψηφία για τα δευτερόλεπτα)</p><p>t/tt (α/π ή πμ/μμ)</p></body></html></translation> </message> @@ -5362,30 +5523,38 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Γλώσσα</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation>Απαιτείται επανεκκίνηση</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Για να φορτώσε σωστά μια γλώσσα πρέπει να επανεκκινήσεσε το Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation>Κυριολεκτικοί χαρακτήρες</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> - <translation>Μη-συγκεκριμένοι χαρακτήρες στην μορφή της ώρας. -Θα χρησιμοποιηθούν ως έχουν, αλλά πιθανώς αυτό δεν είναι ο σκοπός σας. -Δείτε http://doc.qt.io/qt-5/qdatetime.html#toString</translation> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5795,45 +5964,70 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and cannot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>Εισαγωγή πρότυπου αρχείου</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> - <translation>Αρχεία HTML (*.html)</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>Εξαγωγή πρότυπου αρχείου ως</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation>Αυτή η πράξη δεν μπορεί να αναιρεθεί!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>Διαγραφή πρότυπου: %1;</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation type="unfinished"/> </message> </context> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation>(#%1 από %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Άγνωστος καταδυτικός υπολογιστής</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Η εμφάνιση του Ορίου Μη Αποσυμπίεσης / Συνολικού Χρόνου Μέχρι την Επιφάνεια, απενεργοποιήθηκε λόγω υπέρμετρου χρόνου επεξεργασίας</translation> </message> @@ -5843,22 +6037,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Προσθήκη αλλαγής μείγματος</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation>(Φιάλη %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> @@ -5868,6 +6057,11 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation>(φιάλη %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> @@ -5900,8 +6094,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> - <translation>Ρύθμιση πίεσης της φιάλης %1 (προς το παρόν έχει υπολογιστεί με παρεμβολή ως %2)</translation> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> @@ -5947,147 +6141,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation>Έναρξη...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation>εργασία εκτός αποθηκευτικού νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation>Δεν υπάρχουν διαπιστευτήρια νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation>Παρακαλώ εισάγετε έγκυρα διαπιστευτήρια νέφους </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Η διεύθυνση ηλεκτρονικού ταχυδρομείου και το συνθηματικό του αποθηκευτικού νέφους μπορεί να περιλαμβάνει μόνο γράμματα, αριθμούς και '.', '-', '_', και '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Προσπάθεια ανοίγματος αποθήκευσης νέφους με νέα διαπιστευτήρια </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation>Έλεγχος διαπιστευτηρίων νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation>Καμία απόκριση από τον διαμεσολαβητή του αποθηκευτικού νέφους για έλεγχο εγκυρότητας των διαπιστευτηρίων </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Δεν μπορεί να συνδεθεί με το αποθηκευτικό νέφος - ο λογαριασμός αποθηκευτικού νέφους δεν έχει επιβεβαιωθεί </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation>Λανθασμένα διαπιστευτήρια αποθηκευτικού νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Δεν μπορεί να ανοιχθεί το αποθηκευτικό νέφος: Σφάλμα στη δημιουργία συνδέσεων https </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation>Δεν μπορεί να ανοιχθεί το αποθηκευτικό νέφος: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation>Δεν μπορεί να συνδεθεί με το αποθηκευτικό νέφος</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation>Σφάλμα αποθήκευσης στο αποθηκευτικό νέφος: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Αποτυχία σύνδεσης με τον διακομιστή του αποθηκευτικού νέφους, επαναφορά σε καθεστώς λειτουργίας χωρίς αποθηκευτικό νέφος </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Το αποθηκευτικό νέφος ανοίχθηκε με επιτυχία. Δεν υπάρχουν καταδύσεις στον κατάλογο καταδύσεων. </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> <translation>ώρα</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation>δευτερόλεπτα</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> <translation>Άγνωστη θέση GPS</translation> </message> @@ -6185,7 +6379,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6193,7 +6387,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation>ώρα</translation> </message> @@ -6201,7 +6395,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation>δευτερόλεπτα</translation> </message> @@ -6528,7 +6722,7 @@ Not all images have timestamps in the range between </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> + <source>Image files</source> <translation type="unfinished"/> </message> <message> @@ -6642,8 +6836,8 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> - <translation>Εισαγωγή μηνυμάτων (Σφάλματα, προειδοποιήσεις, κλπ)</translation> + <source>Import messages (errors, warnings, etc)</source> + <translation type="unfinished"/> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/> @@ -6652,81 +6846,87 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> - <translation>Αρχεία SmartTrak (*.slg *.SLG);;Όλα τα αρχεία (*)</translation> + <source>SmartTrak files</source> + <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> - <translation>Άνοιγμα αρχείων Subsurface</translation> + <source>All files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> - <translation>Αρχεία Subsurface (*.ssrf *SSRF *.xml *.XML);;Όλα τα αρχεία (*)</translation> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> + <translation>Άνοιγμα αρχείων Subsurface</translation> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation>Μέσο</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation>Καταδυτικά δεδομένα: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation>Διάρκεια: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>ώρα</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation>Τοποθεσία κατάδυσης: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation>Καταδυτικό ζευγάρι: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation> @@ -6921,7 +7121,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation>Δεν καθορίσθηκε στολή</translation> </message> @@ -7047,32 +7247,32 @@ Files with inappropriate date/time</source> <translation>Φωτογραφίες</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Φόρτωση εικόνας(-ων) από αρχείο(-α)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Φόρτωση εικόνας(ων) από το διαδίκτυο</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>Διαγραφή επιλεγμένων εικόνων</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>Διαγραφή όλων των εικόνων </translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>Διαγραφή εικόνων </translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>Σίγουρα θέλετε να διαγράψετε όλες τις εικόνες;</translation> </message> @@ -7249,7 +7449,7 @@ mixed from Air and using: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>Άδειες ετικέτες</translation> </message> @@ -7653,24 +7853,24 @@ mixed from Air and using: <translation>Ο διακομιστής επέστρεψε την ακόλουθη πληροφορία:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Το Subsurface ελέγχει κάθε δύο εβδομάδες για το αν μια νέα έκδοση είναι διαθέσιμη. Αν δεν επιθυμείτε το Subsurface να συνεχίσει να ελέγχει, παρακαλώ πιέστε Απόρριψη.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Απόρριψη</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Αποδοχή</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Αυτόματος έλεγχος για ενημερώσεις</translation> </message> @@ -7932,8 +8132,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation>Χωρίς σφάλμα</translation> </message> @@ -8056,21 +8256,12 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation>Σφάλμα στην ανάλυση της κεφαλίδας</translation> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8401,8 +8592,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>οξυγόνο</translation> </message> @@ -8487,15 +8678,10 @@ Maximum</source> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> - <source>(%s) or (%s)</source> - <translation>(%s) ή (%s)</translation> - </message> - <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>αέρας</translation> </message> @@ -8505,27 +8691,27 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>ενσωματωμένα</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>ζώνη</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>αστραγάλου</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8708,23 +8894,23 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Σφάλμα κατά την σύνδεση με το αποθηκευτικό νέφος Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation>Η κλωνοποίηση git του %s απέτυχε (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>άγνωστο</translation> @@ -8866,75 +9052,75 @@ Maximum</source> <translation>Σφάλμα στο μίγμα αερίων</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Αδύνατον να αναλυθεί το %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Σφάλμα στην καταχώρηση των δεδομένων</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Σφάλμα στα δείγματα</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Συμβάν: Περιμένοντας για ενέργεια από τον χρήστη</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Σφάλμα στην καταχώρηση του συμβάντος</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Σφάλμα στην καταχώρηση της ακύρωσης</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Σφάλμα στην εισαγωγή δεδομένων</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Αδύνατον να ανοιχθεί το %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>πολλαπλές τοποθεσίες GPS για αυτή την καταδυτική θέση, επίσης %s @@ -8942,19 +9128,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation>επιπρόσθετο όνομα για την θέση κατάδυσης: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -8970,19 +9156,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Σφάλμα - %s - ανάλυση κατάδυσης %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation>Ασυνήθιστη ανάγνωση ποσοστού %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation>Σφάλμα στην ανάλυση του '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation>Αδύνατο το άνοιγμα του stylesheet %s</translation> </message> @@ -9001,8 +9187,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation>Προειδοποίηση:</translation> </message> @@ -9028,16 +9214,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Ολικός χρόνος κατάδυσης: %dmin<br></div></translation> @@ -9140,6 +9316,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Κατανάλωση Αέρα στην Επιφάνεια</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9162,6 +9353,16 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> @@ -9207,22 +9408,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <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="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>χαμηλή τιμή pO₂ %.2f σε %d:%02u με μείγμα %s σε βάθος %.*f %s</translation> </message> @@ -9232,12 +9428,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Δεν βρίσκεται το μέιγμα %s</translation> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9246,136 +9442,142 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation>Κατανάλωση Αέρα στην Επιφάνεια: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>Τοξικότητα Κεντρικού Νευρικού Συστήματος: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>Μέγιστο Λειτουργικό Βάθος: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation>Αποσυμπίεση: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1427"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation>Ανάγκη αποσυμπίεσης </translation> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation>Όριο Μη Αποσυμπίεσης: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>Χρόνος Μέχρι την Επιφάνεια: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Αποσυμπίεση: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation>Ανάγκη αποσυμπίεσης (calc) @@ -9383,111 +9585,111 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation>Όριο Μη Αποσυμπίεσης: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation>Όριο Μη Αποσυμπίεσης: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>Χρόνος Μέχρι την Επιφάνεια: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation>Χρόνος Μέχρι την Επιφάνεια: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation>Χρόνος στον Βυθό που Απομένει: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation>Υπολογισμένο βάθος ασφαλούς ανάδυσης %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Ιστός %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation>διόπτευση: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation>μέσο βάθος μέχρι εδώ %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation type="unfinished"/> </message> @@ -10350,22 +10552,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Πόλη</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1237"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> @@ -10378,117 +10580,117 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Φορητό Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation>Κατάλογος καταδύσεων</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation>Ρυθμίσεις</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation>Προσθήκη κατάδυσης μη αυτόματα</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>Μη αυτόματος συγχρονισμός με το αποθηκευτικό νέφος</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation>Λειτουργία χωρίς σύνδεση</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation>Ενεργοποίηση αυτόματου συγχρονισμού αποθηκευτικού νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation>Μεταφόρτωση δεδομένων GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Λήψη δεδομένων GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation>Προβολή στοιχείων θέσεων GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation>Εκκαθάριση τοπικής κρυφής μνήμης GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation>Υπεύθυνος ανάπτυξης </translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation>Αρχείο καταγραφής δεδομένων εφαρμογής </translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation>Πληροφορίες θέματος εμφάνισης</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation>Σχετικά</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation>Εκτέλεση υπηρεσίας τοποθεσίας</translation> </message> @@ -10591,51 +10793,56 @@ p, li { white-space: pre-wrap; } <translation>Σχεδίαση</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation>Πρότυπο αποσυμπίεσης VPM-B</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation>Πρότυπο αποσυμπίεσης Bühlmann</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation>Απόθεμα ανάγκης μείγματος</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation>Αναβολή αλλαγής μείγματος εφόσον δεν απαιτείται στάση </translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation>Αλλαγή μόνο στις επιβεβλημένες στάσεις </translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation>Σχεδίαση διαλειμμάτων χρήσης κυρίως μείγματος</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>min</translation> </message> @@ -10655,153 +10862,153 @@ p, li { white-space: pre-wrap; } <translation>Λειτουργία αναψυχής</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation>Κατάδυση στο μεγαλύτερο βάθος με τον μέγιστο καθορισθέντα ρυθμό</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> - <translation>Ελάχιστη διάρκεια αλλαγής </translation> - </message> - <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> <source>Safety stop</source> <translation>Στάση ασφαλείας</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> <source>Conservatism level</source> <translation>Βαθμός συντηρητισμού</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> + <translation>Λειτουργία κατάδυσης</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation>Επιλογές μείγματος</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation>Χρησιμοποιείται για να υπολογιστεί το βέλτιστο μείγμα. Επιλέξτε το βάθος του βέλτιστου μείγματος στον πίνακα 'Διαθέσιμα μείγματα' εισάγοντας το βάθος του μείγματος, ακολουθούμενο από "B" (βέλτιστο μείγμα trimix) ή "BN" (βέλτιστο μείγμα nitrox) </translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>Χαμηλός Αναλογικός Συντελεστής Αποσυμπίεσης</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>Υψηλός Αναλογικός Συντελεστής Αποσυμπίεσης</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>Κατανάλωση Αέρα στην Επιφάνεια στο μέγιστο βάθος</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation>pO₂ βυθού</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation>Βέλτιστο μείγμα Ισοδύναμου Ναρκωτικού Βάθους </translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Σημειώσεις</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>Στον σχεδιασμό κατάδυσης, προβολή του ολικού χρόνου κατάδυσης (απόλυτου χρόνου) κατά τις στάσεις </translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation>Προβολή ολικού χρόνου κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>Στο σχέδιο της κατάδυσης, προβολή της διάρκειας (σχετικός χρόνος) των στάσεων </translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation>Προβολή διάρκειας σκελών</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>Στο σχέδιο της κατάδυσης, απαρίθμηση των μεταβάσεων ή θεώρησή τους ως εννοούμενες </translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation>Προβολή μεταπτώσεων σε αποσυμπίεση</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation>Λεπτομερής προβολή του σχεδίου κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation>pO₂ Αποσυμπίεσης</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation>Κατανάλωση Αέρα στην Επιφάνεια κατά την αποσυμπίεση</translation> </message> diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index d5d458408..c80df990e 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -47,66 +47,86 @@ <translation>Remote Bluetooth device selection</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Discovered devices</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Save</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Quit</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation>Bluetooth mode</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation>Auto</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation>Force LE mode</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation>Force classic mode</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Clear</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Local Bluetooth device details</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Name: </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Address:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth powered on</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Turn on/off</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Select device:</translation> @@ -117,22 +137,22 @@ <translation>Name:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation>Could not initialize Winsock version 2.2</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation>Trying to turn on the local Bluetooth device...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation>Trying to turn off the local Bluetooth device...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation>Remote devices list was cleared.</translation> </message> @@ -164,22 +184,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation>UNPAIRED</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation>PAIRED</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTHORISED_PAIRED</translation> </message> @@ -189,113 +209,113 @@ <translation>%1 (%2) [State: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>The device %1 can be used for connection. You can press the Save button.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation>A device needs a non-zero address for a connection.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation>The local device was changed.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation>Pair</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation>Remove pairing</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation>Trying to pair device %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation>Trying to unpair device %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation>Device %1 was unpaired.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation>Device %1 was paired.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation>Device %1 was paired and is authorised.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>The device %1 can now be used for connection. You can press the Save button.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation>Local device error: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation>Unknown error</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>The Bluetooth adaptor is powered off, power it on before doing discovery.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Writing to or reading from the device resulted in an error.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation>An unknown error has occurred.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation>Device discovery error: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>Not available</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>The local Bluetooth adapter cannot be accessed.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</translation> </message> @@ -316,7 +336,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>No buddies</translation> </message> @@ -382,7 +402,7 @@ <message> <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> - <translation type="unfinished"/> + <translation>Cloud account verification required, enter PIN in preferences</translation> </message> </context> <context> @@ -1636,84 +1656,84 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Backup dive computer settings</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> - <translation>Backup files (*.xml)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> + <translation>Backup files</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>XML backup error</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>An error occurred while saving the backup file. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Backup succeeded</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>Your settings have been saved to: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Restore dive computer settings</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>XML restore error</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>An error occurred while restoring the backup file. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>Restore succeeded</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>Your settings have been restored successfully.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Select firmware file</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> - <translation>All files (*.*)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> + <translation>All files</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> - <translation>Choose logfile for dive computer download</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> + <translation>Log files</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> - <translation>Log files (*.log)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> + <translation>Choose logfile for dive computer download</translation> </message> </context> <context> @@ -1793,27 +1813,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>Clicking here will remove this cylinder.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Switch depth for deco. gas. Calculated using Deco. pO₂ preference, unless set manually.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>This gas is in use. Only cylinders that are not used in the dive can be removed.</translation> </message> @@ -1927,27 +1947,27 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation>Dive details</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Delete dive</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation>Cancel edit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation>Show on map</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation>Multiple buddies</translation> </message> @@ -1955,104 +1975,104 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation>Dive %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Date:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Location:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation>Coordinates:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation>Use current GPS location:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Depth:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Duration:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Air Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Water Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Suit:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Weight:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation>Cylinder:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation>Gas mix:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation>Start Pressure:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation>End Pressure:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Rating:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation>Visibility:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Notes:</translation> </message> @@ -2128,23 +2148,23 @@ GPS location:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation> (cyl. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>Manual switch to OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation> begin</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation> end</translation> @@ -2309,12 +2329,12 @@ GPS location:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Create a new dive site, copying relevant information from the current dive.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation>Create a new dive site with this name</translation> </message> @@ -2559,76 +2579,76 @@ GPS location:</translation> <translation>Write dive as TeX macros to file.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Export UDDF file as</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>UDDF files (*.uddf *.UDDF)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <source>UDDF files</source> + <translation>UDDF files</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> - <translation>Export CSV file as</translation> + <source>CSV files</source> + <translation>CSV files</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>CSV files (*.csv *.CSV)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <source>HTML files</source> + <translation>HTML files</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> - <translation>Export world map</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Subsurface files</source> + <translation>Subsurface files</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>HTML files (*.html)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>TeX files</source> + <translation>TeX files</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> - <translation>Export Subsurface XML</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <source>Export CSV file as</source> + <translation>Export CSV file as</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <source>Export world map</source> + <translation>Export world map</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>XML files (*.xml *.ssrf)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <source>Export Subsurface XML</source> + <translation>Export Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Save image depths</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Export to TeX file</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> - <translation>TeX files (*.tex)</translation> - </message> - <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Export HTML files as</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Please wait, exporting...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Can't open file %s</translation> </message> @@ -2923,7 +2943,7 @@ GPS location:</translation> <translation><numerusform>(%n dive)</numerusform><numerusform>(%n dives)</numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation>Multiple buddies</translation> </message> @@ -2969,41 +2989,61 @@ GPS location:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>unknown</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation>cyl.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Final depth</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Used gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation>Stop times</translation> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3036,107 +3076,107 @@ GPS location:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Time</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Pressure</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Temperature</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Colour</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>User entered</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Pressure S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Pressure I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Ceiling</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Ambient pressure</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>Heart rate</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>Gradient factor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>Mean depth @ s</translation> </message> @@ -3456,71 +3496,71 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation>Choose Bluetooth download mode</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation>Connecting to dive computer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Find Uemis dive computer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation>Cancel download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation>Choose logfile for dive computer download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> + <translation>Log files</translation> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation>Choose file for dive computer binary dump</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> - <translation>Retry download</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> + <translation>Dump files</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> - <translation>Log files (*.log)</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> + <translation>Retry download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Warning</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Saving the libdivecomputer dump will NOT download dives to the dive list.</translation> </message> - <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> - <translation>Dump files (*.bin)</translation> - </message> </context> <context> <name>DownloadFromDiveComputer</name> @@ -3589,7 +3629,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Download</translation> </message> @@ -3615,7 +3655,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Cancel</translation> </message> @@ -3645,37 +3685,37 @@ p, li { white-space: pre-wrap; } <translation> Connection:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Retry</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Quit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation> Downloaded dives</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Accept</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Select All</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Unselect All</translation> </message> @@ -3706,12 +3746,12 @@ p, li { white-space: pre-wrap; } <translation>Connect to Facebook text placeholder</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</translation> </message> @@ -3905,7 +3945,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation>No location set</translation> </message> @@ -3962,6 +4002,11 @@ p, li { white-space: pre-wrap; } <source>Country</source> <translation>Country</translation> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> + <translation>Update location on map</translation> + </message> </context> <context> <name>LocationInformationModel</name> @@ -3985,29 +4030,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation>Dive site management</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> <translation>Merge into current site</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> <translation>Merging dive sites</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation>You are editing a dive site</translation> </message> @@ -4025,8 +4070,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -4047,19 +4092,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>Air temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>Water temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>Location</translation> </message> @@ -4124,123 +4169,123 @@ p, li { white-space: pre-wrap; } <translation>Duration</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation>Extra Info</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>Information</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation>Statistics</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>Photos</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation>Apply changes</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation>Discard changes</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>Cylinders</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation>Add cylinder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>Weights</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation>Add weight system</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation>OC</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation>Freedive</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>Air temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>Water temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>This trip is being edited.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>Multiple dives are being edited.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>This dive is being edited.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>Trip notes</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>Trip location</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation>New dive site</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>Discard the changes?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation>You are about to discard your changes.</translation> </message> @@ -4253,451 +4298,451 @@ p, li { white-space: pre-wrap; } <translation>&File</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>&View</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>&Help</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>&Import</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation>&Edit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> <translation>Share on</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>&New logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>New</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>&Open logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>Open</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>&Save</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>Save</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>Sa&ve as</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>Save as</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>&Close</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>Close</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>&Print</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>P&references</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>&Quit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>Import from &dive computer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>Import &GPS data from Subsurface web service</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> <translation>Edit device &names</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>&Add dive</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation>&Edit dive</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation>&Copy dive components</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation>&Paste dive components</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>&Renumber</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>Auto &group</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>&Yearly statistics</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>&Dive list</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>&Profile</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>&All</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation>P&revious DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation>&Next DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>&About Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation>User &manual</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> <translation>&Map</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>P&lan dive</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>&Import log files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>Import divelog files from other applications</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>Import &from divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>&Full screen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>Toggle full screen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation>&Check for updates</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>&Export</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation>Export dive logs</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation>Configure &dive computer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation>Edit &dive in planner</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation>Toggle pO₂ graph</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation>Toggle pN₂ graph</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>Toggle pHe graph</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation>Toggle DC reported ceiling</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation>Toggle calculated ceiling</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation>Toggle calculating all tissues</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Toggle calculated ceiling with 3m increments</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>Toggle heart rate</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>Toggle MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>Toggle EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation>Toggle NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation>Toggle SAC rate</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation>Toggle ruler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation>Scale graph</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation>Toggle pictures</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> - <translation>Toggle tank bar</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> + <translation>Toggle gas bar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation>&Filter divelist</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation>Toggle tissue heat-map</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation>User &survey</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>&Undo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>&Redo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation>&Find moved images</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation>Open c&loud storage</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation>Save to clo&ud storage</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation>&Manage dive sites</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation>Dive site &edit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation>Take cloud storage online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Connect to</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Disconnect from</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>Open file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Cancel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation>Don't save an empty log to the cloud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Traverse image directories</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>Scanning images...(this can take a while)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Warning</translation> </message> @@ -4707,105 +4752,230 @@ p, li { white-space: pre-wrap; } <translation>Trying to merge dives with %1min interval between them</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <source>Template backup created</source> + <translation>Template backup created</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Print runtime table</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Trying to replan a dive that's not a planned dive.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Trying to edit a dive that's not a manually added dive.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Yearly statistics</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <source>Dive log files</source> + <translation>Dive log files</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <source>Subsurface files</source> + <translation>Subsurface files</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>Cochran</source> + <translation>Cochran</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>DiveLogs.de</source> + <translation>DiveLogs.de</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>JDiveLog</source> + <translation>JDiveLog</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>Liquivision</source> + <translation>Liquivision</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>Suunto</source> + <translation>Suunto</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>UDCF</source> + <translation>UDCF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <source>XML</source> + <translation>XML</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <source>Divesoft</source> + <translation>Divesoft</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <source>Datatrak/WLog</source> + <translation>Datatrak/WLog</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <source>MkVI files</source> + <translation>MkVI files</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <source>APD log viewer</source> + <translation>APD log viewer</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <source>OSTCtools</source> + <translation>OSTCtools</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <source>DAN DL7</source> + <translation>DAN DL7</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>CSV</source> + <translation>CSV</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <source>All files</source> + <translation>All files</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <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="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Save changes?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <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="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Save file as</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[local cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[cloud storage for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>Opening datafile from older version</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Open dive log file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>Contacting cloud service...</translation> </message> @@ -4813,7 +4983,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation>Drag the selected dive location</translation> </message> @@ -4821,22 +4991,22 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation>Open location in Google Maps</translation> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation>Copy location to clipboard (decimal)</translation> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation>Copy location to clipboard (sexagesimal)</translation> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation>Select visible dive locations</translation> </message> @@ -4844,7 +5014,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation>MapWidget.qml failed to load! @@ -4897,8 +5067,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> - <translation>Firmware files (*.hex *.bin)</translation> + <source>Firmware files</source> + <translation>Firmware files</translation> </message> </context> <context> @@ -4922,89 +5092,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Open circuit</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Last stop at 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% avg. depth to 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20ft to surface</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Last stop at 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% avg. depth to 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6m to surface</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -5118,8 +5288,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation>Subsurface files</translation> </message> </context> <context> @@ -5333,33 +5503,33 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Date format</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation>Use UI language default</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation>This is used in places where there is less space to show the full date</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation>Short format</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation>Time format</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></translation> </message> @@ -5369,30 +5539,41 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Language</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation>Restart required</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>To correctly load a new language you must restart Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation>These will be used as-is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation>Literal characters</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> +</source> <translation>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> +</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> + <translation>Non-special character(s) in date format. +</translation> </message> </context> <context> @@ -5524,12 +5705,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> - <translation type="unfinished"/> + <translation>Subsurface cloud storage (incorrect password)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> - <translation type="unfinished"/> + <translation>Subsurface cloud storage (PIN required)</translation> </message> </context> <context> @@ -5802,45 +5983,71 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation>Read-only template</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and cannot be edited. +Please export this template to a different file.</source> + <translation>The template '%1' is read-only and cannot be edited. +Please export this template to a different file.</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>Import template file</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> - <translation>HTML files (*.html)</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation>HTML files</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation>The destination template '%1' is read-only and cannot be overwritten.</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>Export template files as</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation>This action cannot be undone!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>Delete template: %1?</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation>Delete template '%1'?</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation>The template '%1' is read-only and cannot be deleted.</translation> </message> </context> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (No.%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Unknown dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Show NDL / TTS was disabled because of excessive processing time</translation> </message> @@ -5850,22 +6057,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Add gas change</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation> (Tank %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Make default dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation>Planned dive</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation>Manually added dive</translation> </message> @@ -5875,6 +6077,11 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Delete this dive computer</translation> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation> (cyl. %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Add setpoint change</translation> @@ -5907,8 +6114,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> - <translation>Adjust pressure of tank %1 (currently interpolated as %2)</translation> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> + <translation>Adjust pressure of cyl. %1 (currently interpolated as %2)</translation> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> @@ -5954,147 +6161,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation>Starting...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation>Open local dive data file</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation>Opening local data file failed</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 dives loaded from local dive data file</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation>working in no-cloud mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation>Error parsing local storage, giving up</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation>no cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation>Please enter valid cloud credentials.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> <translation>Invalid format for email address</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Attempting to open cloud storage with new credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation>Testing cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation>No response from cloud server to validate the credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> <translation>Incorrect cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Cannot connect to cloud storage - cloud account not verified</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation>Cloud credentials are invalid</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Cannot open cloud storage: Error creating https connection</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation>Cannot open cloud storage: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation>Cannot connect to cloud storage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation>Cloud credentials valid, loading dives...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation>Cloud storage error: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Loading dives from local storage ('no cloud' mode)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Failed to connect to cloud server, reverting to no-cloud mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Cloud storage open successfully. No dives in dive list.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> <translation>Unknown GPS location</translation> </message> @@ -6192,7 +6399,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6200,7 +6407,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation>h</translation> </message> @@ -6208,7 +6415,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation>sec</translation> </message> @@ -6535,8 +6742,8 @@ Not all images have timestamps in the range between </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> - <translation>Image files (*.jpg *.jpeg)</translation> + <source>Image files</source> + <translation>Image files</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> @@ -6650,8 +6857,8 @@ Files with inappropriate date/time</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> - <translation>Import messages (Errors, warnings, etc)</translation> + <source>Import messages (errors, warnings, etc)</source> + <translation>Import messages (errors, warnings, etc)</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/> @@ -6660,81 +6867,87 @@ Files with inappropriate date/time</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> - <translation>SmartTrak files (*.slg *.SLG);;All files (*)</translation> + <source>SmartTrak files</source> + <translation>SmartTrak files</translation> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>All files</source> + <translation>All files</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> - <translation>Open Subsurface files</translation> + <source>Subsurface files</source> + <translation>Subsurface files</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> - <translation>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</translation> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> + <translation>Open Subsurface files</translation> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation>Small</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation>Medium</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation>Dive date: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation>Duration: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation>Dive location: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation>Buddy: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation> @@ -6929,7 +7142,7 @@ Files with inappropriate date/time</translation> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation>No suit set</translation> </message> @@ -7055,32 +7268,32 @@ Files with inappropriate date/time</translation> <translation>Photos</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Load image(s) from file(s)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Load image(s) from web</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>Delete selected images</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>Delete all images</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>Deleting Images</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>Are you sure you want to delete all images?</translation> </message> @@ -7258,7 +7471,7 @@ mixed from Air and using: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>Empty tags</translation> </message> @@ -7662,24 +7875,24 @@ mixed from Air and using: <translation>The server returned the following information:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface checks every two weeks to see if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Decline</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Accept</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Automatic check for updates</translation> </message> @@ -7941,8 +8154,8 @@ Language: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation>No error</translation> </message> @@ -8066,22 +8279,12 @@ Maximum</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation>Error parsing the header</translation> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation>Density: %.1fg/ℓ -</translation> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8413,8 +8616,8 @@ Maximum</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>oxygen</translation> </message> @@ -8499,15 +8702,10 @@ Maximum</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> - <source>(%s) or (%s)</source> - <translation>(%s) or (%s)</translation> - </message> - <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>air</translation> </message> @@ -8517,27 +8715,27 @@ Maximum</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>integrated</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>belt</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>ankle</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation>backplate</translation> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8720,23 +8918,23 @@ Maximum</translation> <translation>Done syncing with cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Error connecting to Subsurface cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation>git clone of %s failed (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation>Synchronising data file</translation> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>unknown</translation> @@ -8878,62 +9076,62 @@ Maximum</translation> <translation>Error parsing the gas mix</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Unable to create parser for %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Error registering data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Error parsing the samples</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation>Already downloaded dive at %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Event: waiting for user action</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation>model=%s firmware=%u serial=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Error registering the event handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Error registering the cancellation handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Dive data import error</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Unable to open %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -8942,13 +9140,13 @@ In most cases, in order to debug this issue, a libdivecomputer logfile will be u You can create this logfile by selecting the corresponding checkbox in the download dialog.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation>No new dives downloaded from dive computer</translation> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>multiple GPS locations for this dive site; also %s @@ -8956,19 +9154,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation>additional name for site: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation>Load dives from local cache</translation> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation>Successfully opened dive data</translation> </message> @@ -8984,19 +9182,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Error - %s - parsing dive %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation>Strange percentage reading %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation>Failed to parse '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation>Can't open stylesheet %s</translation> </message> @@ -9015,8 +9213,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation>Warning:</translation> </message> @@ -9042,16 +9240,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation>dive plan</b> (Overlapping dives detected)</translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime: %dmin<br></div></translation> @@ -9154,6 +9342,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>SAC</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation>%.0f%s of <span style='color: red;'><b>%s</b></span></translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9176,6 +9379,16 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>dive plan</b> created on</translation> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation>dive plan</b> (overlapping dives detected)</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation>Runtime: %dmin%s</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</translation> @@ -9221,22 +9434,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>required minimum gas for ascent already exceeds start pressure of cylinder.</translation> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <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="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation> </message> @@ -9246,12 +9454,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Can't find gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9260,84 +9468,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Safety stop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9346,7 +9554,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9355,161 +9563,168 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1427"/> + <source>Density: %.1fg/ℓ +</source> + <translation>Density: %.1fg/ℓ +</translation> + </message> + <message> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Safety stop: unknown time @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deco: unknown time @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation>In deco (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation>Calculated ceiling %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Tissue %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation>heart rate: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation>bearing: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation>mean depth to here %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation>%s SAC: %.*f%s</translation> </message> @@ -9850,7 +10065,7 @@ EADD: %d%s / %.1fg/ℓ <message> <location filename="../core/statistics.c" line="142"/> <source>All (by type stats)</source> - <translation type="unfinished"/> + <translation>All (by type stats)</translation> </message> <message> <location filename="../core/statistics.c" line="144"/> @@ -10374,22 +10589,22 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>City</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation>Start saving data</translation> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation>Start saving dives</translation> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation>Done creating local cache</translation> </message> <message> - <location filename="../core/save-git.c" line="1237"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation>Preparing to save data</translation> </message> @@ -10402,117 +10617,117 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation>Dive list</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation>Dive management</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation>Disable location service</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation>Settings</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation>Add dive manually</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation>Download from DC</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> - <source>Apply GPS Fixes</source> - <translation>Apply GPS fixes</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>Manual sync with cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation>Offline mode</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation>Enable auto cloud sync</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation>Help</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation>Upload GPS data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Download GPS data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation>Show GPS fixes</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation>Clear GPS cache</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation>Developer</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation>App log</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation>Theme information</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation>About</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation>Run location service</translation> </message> @@ -10615,51 +10830,56 @@ p, li { white-space: pre-wrap; } <translation>Planning</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation>Min. switch duration O₂% below 100%</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation>VPM-B deco</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation>Bühlmann deco</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation>Reserve gas</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation>Postpone gas change if a stop is not required</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation>Only switch at required stops</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation>Plan backgas breaks</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>min</translation> </message> @@ -10679,153 +10899,153 @@ p, li { white-space: pre-wrap; } <translation>Recreational mode</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation>Drop to first depth</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> - <translation>Min. switch duration</translation> - </message> - <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> <source>Safety stop</source> <translation>Safety stop</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> <source>Conservatism level</source> <translation>Conservatism level</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> + <translation>Dive mode</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation>Gas options</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation>Compute variations of plan (performance cost)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation>Display plan variations</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation>SAC factor</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation>Problem solving time</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation>Used to calculate minimum gas. Additional time at max. depth after OoG event.</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>Bottom SAC</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation>Bottom pO₂</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation>Best mix END</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Notes</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>In dive plan, show runtime (absolute time) of stops</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation>Display runtime</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>In dive plan, show duration (relative time) of stops</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation>Display segment duration</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>In dive plan, list transitions or treat them as implicit</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation>Display transitions in deco</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation>Verbatim dive plan</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation>Deco pO₂</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation>Deco SAC</translation> </message> diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts index 473abb691..05101ca3a 100644 --- a/translations/subsurface_es_ES.ts +++ b/translations/subsurface_es_ES.ts @@ -2330,12 +2330,12 @@ GPS actual:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="373"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Crea un nuevo punto de buceo, tomando información relevante de la inmersión actual.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="374"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation>Crea un nuevo punto de buceo con este nombre</translation> </message> @@ -2580,76 +2580,76 @@ GPS actual:</translation> <translation>Guardar la inmersión como macros de TeX.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Exportar archivo UDDF como</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> <source>UDDF files</source> <translation>archivo UDDF</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> <source>CSV files</source> <translation>archivo CSV</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> <source>HTML files</source> <translation>archivo HTML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> <source>Subsurface files</source> <translation>archivos de Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>TeX files</source> <translation>archivo TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>Export CSV file as</source> <translation>Exportar archivo CSV como</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export world map</source> <translation>Exportar mapamundi</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> <source>Export Subsurface XML</source> <translation>Exportar a XML de Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Guardar profundidades de las imágenes</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Exportar a archivo TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Exportar archivos HTML como</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Espere mientras se exporta…</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>No se puede abrir el archivo %s</translation> </message> @@ -2990,41 +2990,61 @@ GPS actual:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="157"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="192"/> - <location filename="../qt-models/diveplannermodel.cpp" line="277"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation>bot.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Profundidad final</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Tiempo acumulado</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Duración</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Gas usado</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="381"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3610,7 +3630,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Descargar</translation> </message> @@ -3636,7 +3656,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -3666,37 +3686,37 @@ p, li { white-space: pre-wrap; } <translation>Conexión:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Intentar de nuevo</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Salir</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>Descargar inmersiones</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Aceptar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Seleccionar todo</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Des-seleccionar todo</translation> </message> @@ -3983,6 +4003,11 @@ p, li { white-space: pre-wrap; } <source>Country</source> <translation>Pais</translation> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> + <translation>Actualizar posición en el mapa</translation> + </message> </context> <context> <name>LocationInformationModel</name> @@ -4006,29 +4031,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="253"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation>Gestión de puntos de buceo</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="64"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> <translation>Mezclar en el punto actual</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="73"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> <translation>Mezclando puntos de buceo</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="74"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation>Estás a punto de mexclar puntos de buceo, esta acción no se puede deshacer ¿Seguro que deseas continuar?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="260"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation>Estas editando un punto de buceo</translation> </message> @@ -4046,8 +4071,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>Notas</translation> </message> @@ -4068,19 +4093,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>Temperatura del aire</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>Temperatura del agua</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>Ubicación</translation> </message> @@ -4145,123 +4170,123 @@ p, li { white-space: pre-wrap; } <translation>Duración</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation>Info extra</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>Información</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation>Estadísticas</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>Fotos</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation>Aplicar cambios</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation>Descartar cambios</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>Botellas</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation>Añadir botella</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>Lastre</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation>Añadir sistema de lastre</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation>OC</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation>Apnea</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>Temp. aire [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>Temp. agua [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>Este viaje está siendo editado.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>Se están editando varias inmersiones.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>Esta inmersión esta siendo editada.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>Notas del viaje</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>Ubicación del viaje</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation>Nuevo punto de buceo</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>¿ Descartar los cambios ?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation>Estás a punto de descartar tus cambios.</translation> </message> @@ -4274,420 +4299,420 @@ p, li { white-space: pre-wrap; } <translation>Archivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>Registro</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>&Vista</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>Ayuda</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>&Importar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation>&Editar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> <translation>Compartir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>&Nuevo registro</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>Nuevo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>Abrir registr&o</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="560"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>Guardar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>Guardar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>Guardar como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>Guardar como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>&Cerrar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>Cerrar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>Im&primir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>P&referencias</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>Salir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>Importar del or&denador de buceo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importar datos &GPS del servicio web de Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> <translation>Editar &nombres de dispositivos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>&Añadir inmersión</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation>&Editar inmersión</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation>&Copiar componentes</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation>&Pegar componentes</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>&Renumerar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>Auto a&grupar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>Estadísticas anuales</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>Lista &de Inmersiones</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>&Perfil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>&Información</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>Todo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation>Ante&rior ordenador</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation>Siguie&nte ordenador</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>&Acerca de Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation>&Manual de usuario</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> <translation>&Mapa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>P&lanificar inmersión</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>&Importar archivos de registro</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>Importar archivos de registro de otras aplicaciones</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>Importar desde Divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>Pantalla completa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>Activar pantalla completa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation>&Comprobar si hay actualizaciones</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>&Exportar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation>Exportar diarios de buceo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation>Configurar or&denador de buceo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation>Editar inmersión en el planificador</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation>Activar gráfico de pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation>Activar gráfico de pN₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>Activar el gráfico de pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation>Activar techo informado por el ordenador</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation>Activar techo calculado</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation>Activar cálculo de todos los tejidos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Activar techo calculado con incrementos de 3m</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>Activar ritmo cardiaco</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>Activar PMO</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>Activar PEA, PNE y EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation>Activar LND, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation>Activar tasa de CAS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation>Activar regla</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation>Escalar gráfico</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation>Activar fotografías</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> - <translation>Activar barra de la botella</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> + <translation>Activar barra de gases</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation>&Filtrar la lista de inmersiones</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation>Activar heat-map de tejidos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation>Encuesta de u&suario</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>Deshacer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>&Rehacer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation>Encontrar imágenes movidas</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation>Abrir a&lmacenamiento en la nube</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation>Guardar en almacenamiento en la n&ube</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation>Gestionar puntos de buceo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation>&Editar punto de buceo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation>Activar almacenamiento en la nube</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="370"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Conectar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="400"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Desconectar de </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="596"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1678"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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="../desktop-widgets/mainwindow.cpp" line="557"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>Abrir archivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -4697,28 +4722,28 @@ p, li { white-space: pre-wrap; } <translation>No guardar un divelog vacío en la nube</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="669"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Buscar en directorios de imágenes</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Escanear</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>Buscando imágenes ... (esto puede llevar un tiempo)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Advertencia</translation> </message> @@ -4728,12 +4753,12 @@ p, li { white-space: pre-wrap; } <translation>Intentando fusionar inmersiones con %1min de intervalo entre ellas</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> <source>Template backup created</source> <translation>Creada plantilla de respaldo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>The following backup printing templates were created: %1 @@ -4755,202 +4780,202 @@ Ubicación: Desde esta versión de Subsurface, las plantillas predefinidas serán de solo lectura y no deben editarse directamente, ya que la aplicación puede sobre escribirlas al iniciarse.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="731"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="857"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="909"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Imprimir tabla de tiempo acumulado</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Se está intentando re-planificar un buceo que no ha sido planificado</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Intentando editar una inmersión que no se ha añadido manualmente.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1108"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Estadísticas anuales</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1287"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> <source>Dive log files</source> <translation>Archivos de registro de inmersiones </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> <source>Subsurface files</source> <translation>archivos de Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> <source>MkVI files</source> <translation>archivos MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> <source>APD log viewer</source> <translation>APD Log Viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> <source>OSTCtools</source> <translation>OSTCtool</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> <source>All files</source> <translation>Todos los archivos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <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="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>¿Guardar cambios?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <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="../desktop-widgets/mainwindow.cpp" line="1705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Guardar archivo como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1793"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[caché local de] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[almacenamiento en la nube de] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1902"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>Abriendo archivo de datos de una versión anterior</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1903"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Has abierto un archivo de datos de una versión anterior de Subsurface. Te recomendaamos leer el manual para informarte acerca de los cambios de la nueva versión, especialmente sobre la gestión de puntos de buceo que ha variado significativamente. Subsurface ya ha intentado cargar los datos pero puede que merezca la pena perder un momento en echar una mirada al nuevo sistema de gestión de puntos de buceo para asegurarte de que todo este correcto.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1914"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Abrir archivo de registro de inmersiones</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>Contactando con el servicio en la nube ...</translation> </message> @@ -4958,7 +4983,7 @@ Subsurface ya ha intentado cargar los datos pero puede que merezca la pena perde <context> <name>MapWidget</name> <message> - <location filename="../map-widget/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation>Arrastra el punto de buceo seleccionado</translation> </message> @@ -5067,89 +5092,89 @@ Si tu dispositivo usa Bluetooth, efectúa los mismos preparativos que para desca <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Circuito abierto</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Última parada a 20pies</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>De 50% de prof. media a 20 pies</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>De 20 pies a superficie</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Última parada a 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>De 50% prof. media a 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>De 6m a superficie</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>pies3/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -5966,10 +5991,10 @@ Visita http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <source>The template '%1' is read-only and connot be edited. + <source>The template '%1' is read-only and cannot be edited. Please export this template to a different file.</source> - <translation>La plantilla '%1' es de solo-lectura y no puede editarse. -Por favor, copia esta plantilla a un archivo distinto.</translation> + <translation>La plantilla '%1' es de solo lectura y no puede modificarse. +Por favor, exporta esta plantilla a un archivo distinto.</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="148"/> @@ -6012,17 +6037,17 @@ Por favor, copia esta plantilla a un archivo distinto.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (#%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Ordenador de buceo desconocido</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Mostrar LND/TTS se ha desactivado por excesivo tiempo de proceso</translation> </message> @@ -6037,12 +6062,12 @@ Por favor, copia esta plantilla a un archivo distinto.</translation> <translation>Convertir en ordenador de buceo principal</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation>Inmersión planeada</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation>Inmersión añadida a mano</translation> </message> @@ -6136,147 +6161,147 @@ Por favor, copia esta plantilla a un archivo distinto.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation>Iniciando...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation>Abrir archivo de datos local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation>Abrir archivo de datos local ha fallado</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 inmersiones cargados desde archivo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation>Funcionando en modo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation>Error analizando el almacenamiento local. Abortando.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation>sin credenciales para la nube</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation>Por favor, introduce credenciales para la nube validas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>El correo y la contraseña del almacenamiento en la nube solo pueden contener letras, números, '.', '-', '_', y '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> <translation>Formato de correo electrónico inválido</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Intentando acceder al almacenamiento en la nube con nuevas credenciales</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation>Comprobando credenciales para la nube</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation>Sin respuesta del servidor en la nube al validar las credenciales</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> <translation>Credenciales de la nube incorrectas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>No se puede conectar con el almacenamiento en la nube - la cuenta no pudo verificarse</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation>Credenciales para la nube invalidas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>No se puede abrir el almacenamiento en la nube: Error al crear la conexión https</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation>No se pudo abrir el almacenamiento en la nube: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation>No se pudo conectar con el almacenamiento en la nube</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation>Credenciales en la nube validadas, cargando inmersiones ...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation>Error en almacenamiento en la nube: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Cargando inmersiones desde el almacenamiento local (sin nube)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Fallo al conectar con el servidor en la nube, volviendo al modo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Almacenamiento en la nube abierto. No hay inmersiones en la lista.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation>seg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> <translation>Posición GPS desconocida</translation> </message> @@ -7244,32 +7269,32 @@ Archivos con fecha/hora incorrectas</translation> <translation>Fotos</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Cargar imagen(es) de archivo(s)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Cargar imagen(es) desde la web</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>Borrar imágenes seleccionadas</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>Borrar todas las imágenes</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>Borrando imágenes</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>¿ Estás seguro de querer borrar todas las imágenes ?</translation> </message> @@ -7851,24 +7876,24 @@ a partir de aire y usando: <translation>El servidor devolvió la siguiente información:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface comprueba cada dos semanas si hay una nueva versión disponible. Si no quieres que Subsurface siga haciendolo, por favor pulsa Declinar.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Declinar</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Aceptar</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Comprobación automática de actualizaciones</translation> </message> @@ -8592,8 +8617,8 @@ Media</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1144"/> - <location filename="../core/planner.c" line="1147"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>oxígeno</translation> </message> @@ -8678,15 +8703,10 @@ Media</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1879"/> - <source>(%s) or (%s)</source> - <translation>(%s) o (%s)</translation> - </message> - <message> <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1140"/> - <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>aire</translation> </message> @@ -8696,27 +8716,27 @@ Media</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>integrado</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>cinturón</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>tobillo</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation>placa</translation> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8914,8 +8934,8 @@ Media</translation> <translation>Sincronizando archivo de datos</translation> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3481"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>desconocido</translation> @@ -9127,7 +9147,7 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1280"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>multiples posiciones GPS para este punto de buceo; también %s @@ -9135,19 +9155,19 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1342"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation>otro nombre para este sitio: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation>Carga de inmersiones de la caché local</translation> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation>Abiertos datos de inmersiones</translation> </message> @@ -9163,19 +9183,19 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en <translation>Error - %s - al analizar la inmersión %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation>Porcentaje extraño al leer %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2104"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation>No se pudo analizar '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="4003"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation>No se puede abrir la hoja de estilo %s</translation> </message> @@ -9221,11 +9241,6 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en <translation>BÜHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation>Runtime: %dmin %s</translation> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime: %dmin<br></div></translation> @@ -9370,6 +9385,11 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en <translation>plan de buceo</b> (detectadas inmersiones solapadas)</translation> </message> <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Modelo deco: Bühlmann ZHL-16C con GFbajo = %d%% y GFalto = %d%%</translation> @@ -9435,12 +9455,12 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en <translation>No puedo encontrar el gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1148"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1373"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9449,84 +9469,84 @@ Prof: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1385"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1391"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation>CAS: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1396"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1400"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1402"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1405"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>PMO: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1445"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation>Parada deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Parada de seguridad: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1381"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1414"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9535,7 +9555,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9544,168 +9564,168 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1425"/> + <location filename="../core/profile.c" line="1427"/> <source>Density: %.1fg/ℓ </source> <translation>Densidad: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Parada de seguridad: duración desconocida @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1448"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Parada deco: duración desconocida @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1452"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation>En deco </translation> </message> <message> - <location filename="../core/profile.c" line="1454"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1457"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1460"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Parada deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1468"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation>En deco (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1471"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation>LND: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1477"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1479"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1482"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1485"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation>Techo calculado %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1491"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Tejido %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1497"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation>ritmo cardiaco: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1499"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation>Soporte: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1502"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation>Prof. media hasta aquí %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1599"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1603"/> - <location filename="../core/profile.c" line="1607"/> - <location filename="../core/profile.c" line="1611"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation>%s %sProf:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1615"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation>%s %sProf:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1619"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1623"/> - <location filename="../core/profile.c" line="1627"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation>%s %sPres:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1659"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation>%s CAS: %.*f%s</translation> </message> @@ -10570,22 +10590,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Ciudad</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation>Comienza el guardado de datos</translation> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation>Comienza el guardado de inmersiones</translation> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation>Crear caché local terminado</translation> </message> <message> - <location filename="../core/save-git.c" line="1237"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation>Preparando el guardado de datos</translation> </message> @@ -10633,11 +10653,6 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Descargar desde el ordenador</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="156"/> - <source>Apply GPS Fixes</source> - <translation>Aplicar posiciones GPS</translation> - </message> - <message> <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>Sincronización manual con la nube</translation> @@ -10673,6 +10688,11 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Subir datos GPS</translation> </message> <message> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation>Aplicar posiciones GPS</translation> + </message> + <message> <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Descargar datos GPS</translation> diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts index 97ffa926f..832052b29 100644 --- a/translations/subsurface_et_EE.ts +++ b/translations/subsurface_et_EE.ts @@ -47,66 +47,86 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Salvesta</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Välju</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Skaneeri</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Puhasta</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Nimi:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Aadress:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth sisselülitatud</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Lülita sisse/välja</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Vali seade</translation> @@ -117,22 +137,22 @@ <translation>Nimi:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation>Proovin sisse lülitada kohalikku Bluetooth seadet...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation>Proovin sisse lülitada kohalikku Bluetooth seadet...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation type="unfinished"/> </message> @@ -164,22 +184,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation>MITTEPAARITATUD</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation>PAARITATUD</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTORISEERITUD_PAARITATUD</translation> </message> @@ -189,113 +209,113 @@ <translation>%1 (%2) [Olek: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation>Kohalik seade on vahetatud</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation>Paarita</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation>Eemalda paaritus</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation>Üritan paarituda seadmega %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation>Üritan paaritada lahti seadmest %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation>Seade %1 on lahti paaritatud.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation>Seade %1 on paaritatud.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation>Seade %1 on paaritatud ja autoriseeritud.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation>Kohaliku seadme viga: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation>Tundmatu viga</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>Pole kättesaadav</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -316,7 +336,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>Pole semu</translation> </message> @@ -1636,84 +1656,84 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Varunda sukeldumiskompuutri seaded</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> - <translation>Varukoopia failid (*.xml)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>XML varundamise viga</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>Viga varukoopia faili kirjutamisel. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Varundamine õnnestus</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>Seaded on salvestatud: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Taasta sukeldumiskompuutri seaded</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>XML taastamise viga</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Viga varukoopia taastamisel. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>Taastamine õnnestus</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>Seaded on edukalt taastatud.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Vali firmware fail</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> - <translation>Kõik failid (*.*)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> - <translation>Logifailid (*.log)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1793,27 +1813,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>Siin klikkamine eemaldab selle ballooni</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>See gaas on kasutusel. Eemaldada saab ainult neid balloone, mis pole sellel sukeldumisel kasutusel.</translation> </message> @@ -1927,27 +1947,27 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation>Sukeldumise info</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Kustuta sukeldumine</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation>Näita kaardil</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation>Mitu semu</translation> </message> @@ -1955,104 +1975,104 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation>Sukeldumise #%1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Kuupäev:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Asukoht:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation>Koordinaadid:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation>Kasuta praegust asukohta:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Sügavus:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Kestus:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Õhu temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Vee temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Ülikond:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Semu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Raskus</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation>Balloon:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation>Gaasisegu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation>Algrõhk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation>Lõpurõhk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Hinne:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Märkmed:</translation> </message> @@ -2128,23 +2148,23 @@ asukohta:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation>(balloon %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>Käsilülitus avatud süsteemile</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation> algus</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation> lõpp</translation> @@ -2309,12 +2329,12 @@ asukohta:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Loo uus sukeldumiskoht kopeerides asjakohase info praegusest sukeldumisest</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation>Loo uus sukeldumiskoht selle nimega</translation> </message> @@ -2559,76 +2579,76 @@ asukohta:</translation> <translation>Kirjuta sukeldumine TeX makro kujul faili</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Ekspordi UDDF fail kui</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>UDDF failid (*.uddf *.UDDF)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <source>UDDF files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> - <translation>Ekspordi CSV fail kui</translation> + <source>CSV files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>CSV failid (*.csv *.CSV)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <source>HTML files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> - <translation>Ekspordi maailmakaart</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>HTML failid (*.html)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>TeX files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> - <translation>Ekspordi Subsurface XML</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <source>Export CSV file as</source> + <translation>Ekspordi CSV fail kui</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>XML failid (*.xml *.ssrf)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <source>Export world map</source> + <translation>Ekspordi maailmakaart</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <source>Export Subsurface XML</source> + <translation>Ekspordi Subsurface XML</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Salvesta piltide sügavused</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Eksport TeX faili</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> - <translation>TeX failid (*.tex)</translation> - </message> - <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Ekspordi HTML fail kui</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Palun oota, ekspordin...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Ei saa avada faili %s</translation> </message> @@ -2923,7 +2943,7 @@ asukohta:</translation> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation>Mitu semu</translation> </message> @@ -2969,41 +2989,61 @@ asukohta:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>tundmatu</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Lõppsügavus</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Töö aeg</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Kestus</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Kasutatud gaas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>jalg</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3036,107 +3076,107 @@ asukohta:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Sügavus</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Aeg</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Rõhk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Temperatuur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Värvus</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Kasutaja sisestatud</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Rõhk S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Rõhk I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Lagi</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHE</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Ümbritsev rõhk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>Südame pulss</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>Keskmine sügavus @ s</translation> </message> @@ -3461,71 +3501,71 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Allalaadimine</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation>Vali Bluetoothi allalaadimise viis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Viga</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Leia Uemis sukeldumiskompuuter</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> - <translation>Logifailid (*.log)</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Hoiatus</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>libdivecomputer tõmmisefaili salvestamine EI LAE sukeldumised sukeldumiste listi.</translation> </message> - <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> - <translation>Tõmmisefailid (*.bin)</translation> - </message> </context> <context> <name>DownloadFromDiveComputer</name> @@ -3594,7 +3634,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Allalaadimine</translation> </message> @@ -3620,7 +3660,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Loobu</translation> </message> @@ -3650,37 +3690,37 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Korda</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Välju</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>Allalaetud sukeldumised</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Kinnita</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Vali kõik</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Tühista kõik</translation> </message> @@ -3711,12 +3751,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Facebookiga ühenduse loomiseks logi sinna sise. See võimaldab Suibsurface'l avaldada sukeldumisi sinu ajajoonel</translation> </message> @@ -3910,7 +3950,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3967,6 +4007,11 @@ p, li { white-space: pre-wrap; } <source>Country</source> <translation>Riik</translation> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> + <translation type="unfinished"/> + </message> </context> <context> <name>LocationInformationModel</name> @@ -3990,29 +4035,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation>Sukeldumiskohtade haldamine</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> <translation>Ühenda olemasoleva sukeldumiskohaga</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> <translation>Ühendan sukeldumiskohad</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation>Soovid ühendada sukeldumiskohad, seda tegevust ei ole võimalik tagasi võtta Oled kindel et soovid jätkata?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation>Toimetad sukeldumiskohta</translation> </message> @@ -4030,8 +4075,8 @@ Oled kindel et soovid jätkata?</translation> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>Märkmed</translation> </message> @@ -4052,19 +4097,19 @@ Oled kindel et soovid jätkata?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>Õhu temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>Vee temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>Asukoht</translation> </message> @@ -4129,123 +4174,123 @@ Oled kindel et soovid jätkata?</translation> <translation>Kestus</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>Info</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation>Statistika</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>Fotod</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation>Rakenda muudatused</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation>Tühista muudatused</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>Balloonid</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation>Lisa balloon</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>Raskused</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation>Lisa raskuste süsteem</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation>OC</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation>Vabasukeldumine</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>Õhu temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>Vee temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>Seda väljasõitu toimetatakse</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>Mitut sukeldumist toimetatakse</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>Seda sukeldumist toimetatakse.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>Väljasõidu märkmed</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>Väljasõidu koht</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation>Uus sukeldumiskoht</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>Loobu muudatustest?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation>Oled muudatustest loobumas.</translation> </message> @@ -4258,451 +4303,451 @@ Oled kindel et soovid jätkata?</translation> <translation>&Fail</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>&Logi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>&Vaade</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>&Abi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>&Import</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation>&Toimeta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>&Uus logiraamat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>Uus</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>&Ava logiraamat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>Ava</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>&Salvesta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>Salvesta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>Sa&lvesta nimega</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>Salvesta nimega</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>&Sulge</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>Sulge</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>&Väljastus</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>Eelistused</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>&Välju</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>Impordi &sukeldumiskompuutrist</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>Impordi &GPS andmed Subsurface veebiteenusest</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> <translation>Toimeta seadme &nimed</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>&Lisa sukeldumine</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation>&Toimeta sukeldumist</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation>&Kopeeri sukeldumise komponendid</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation>&kleebi sukeldumise komponendid</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>&Nummerda ümber</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>Automaatne grupeerimine</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>&Aastane statistika</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>&Sukeldumiste nimekiri</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>&Profiil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>&info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>&Kõik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation>&Eelmine sukeldumiskompuuter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation>&Järgmine sukeldumiskompuuter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>Subsurface kohta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation>Kasutaja &juhend</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>P&laneeri sukeldumine</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>&Impordi logifailid</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>Impordi sukeldumislogi failid teistest rakendustest</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>Import divelogs.de-st</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>&Täisekraan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>Kuva täisekraan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation>Kontrolli uuendusi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>&Eksport</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation>Ekspordi sukeldumiste logid</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation>Seadista &dive kompuuter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation>Toimeta &sukeldumine planeerijas</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation>pO₂ graaf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation>pN₂ graaf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>pHe graaf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation>Sukeldumiskompuutri poolt antud lagi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation>Arvutatud lagi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation>Kõik koed</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Arvutatud lagi 3m intervalliga</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>Südame pulss</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation>NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation>SAC määr</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation>Joonlaud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation>Skaleeri graaf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation>Pildid</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> - <translation>Balloon(id)</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation>Kasutajaküsitlus</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation>Salvesta pilve</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation>Sukeldumiskoha toimetamine</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Ühenda</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Ühenda lahti</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>Ava fail</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Loobu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Skaneeri</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Hoiatus</translation> </message> @@ -4712,104 +4757,220 @@ Oled kindel et soovid jätkata?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Väljasta jooksva aja tabel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Lõpeta praegune toimetamine enne järgmise alustamist.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Aastane statistika</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>CSV</source> + <translation>CSV</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <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="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Salvesta muudatused?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <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="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Salvesta nimega</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Ava sukeldumislogi fail</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4817,7 +4978,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4825,22 +4986,22 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4848,7 +5009,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4898,8 +5059,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> - <translation>Püsivara failid (*.hex, *.bin)</translation> + <source>Firmware files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4923,89 +5084,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Avatud süsteem</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>jalg/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Viimane peatus 20 jala peal</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% keskmine sügavus 20 jalani</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20 jalga pinnani</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>jalg</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Viimane peatus 6m peal</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% keskmine sügavus 6m-i</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6m pinnani</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>kuupjalg/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -5119,8 +5280,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML failid (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5334,33 +5495,33 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Kuupäeva formaat</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation>Kasuta kasutajaliidese keele vaikeväärtust</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation>Lühike formaat</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation>Aja formaat</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation type="unfinished"/> </message> @@ -5370,27 +5531,37 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Keel</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation>Nõutav taaskäivitus</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Uue keele kasutuselevõtuks tuleb Subsurface taaskäivitada.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation>Tähemärgid</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> <translation type="unfinished"/> </message> </context> @@ -5801,45 +5972,70 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and cannot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>Impordi mallifail</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> - <translation>HTML failid (*.html)</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>Ekspordi mallifail kui</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>Kustuta mall: %1?</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation type="unfinished"/> </message> </context> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation>(#%1 %2st)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Tundmatu sukeldumiskompuuter</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> @@ -5849,22 +6045,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Lisa gaasivahetus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation> (Balloon %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> @@ -5874,6 +6065,11 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation>(balloon %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> @@ -5906,7 +6102,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> @@ -5953,147 +6149,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation>Alustan...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation>Töötamine mitte-pilve režiimis</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation>pole pilve volitusi</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation>Palun sisesta kehtivad pilve volitused.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Üritan avada pilvesalvestit uute volitustega</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation>Pilve volituste testimine</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation>Ei saa avada pilve salvestit: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation>Ei saa ühendust pilve salvestiga</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation>Pilve salvesti viga: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Pilve salvesti avamine õnnestus. Sukeldumiste nimekiri on tühi.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> <translation>Tundmatu GPS koht</translation> </message> @@ -6191,7 +6387,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6199,7 +6395,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation>h</translation> </message> @@ -6207,7 +6403,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation>sek</translation> </message> @@ -6532,7 +6728,7 @@ Not all images have timestamps in the range between </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> + <source>Image files</source> <translation type="unfinished"/> </message> <message> @@ -6646,8 +6842,8 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> - <translation>Impordi teated (vead, hoiatused, jm)</translation> + <source>Import messages (errors, warnings, etc)</source> + <translation type="unfinished"/> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/> @@ -6656,81 +6852,87 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> - <translation>SmartTrak failid (*.slg *.SLG);;Kõik failid (*)</translation> + <source>SmartTrak files</source> + <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> + <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> - <translation>Subsurface failid (*.ssrf *SSRF *.xml *.XML);; Kõik failid (*)</translation> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> + <translation type="unfinished"/> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation>Keskmine</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation>Sukeldumise kuupäev: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation>Kestus: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation>Sukeldumise asukoht: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation>Semu: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation> @@ -6925,7 +7127,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7051,32 +7253,32 @@ Files with inappropriate date/time</source> <translation>Fotod</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Lae pilt (pildid) faili(de)st</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Lae pilt (pildid) veebist</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>Kustuta valitud pildid</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>Kustuta kõik pildid</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>Kustutan pildid</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>Oled kindel et soovid kustutada kõik pildid?</translation> </message> @@ -7253,7 +7455,7 @@ mixed from Air and using: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>Tühjad märgendid</translation> </message> @@ -7657,23 +7859,23 @@ mixed from Air and using: <translation>Server saatis järgneva info:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Loobu</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Kinnita</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Automaatne uuenduste kontroll</translation> </message> @@ -7935,8 +8137,8 @@ Keel: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation>Pole viga</translation> </message> @@ -8060,21 +8262,12 @@ Max</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8405,8 +8598,8 @@ Max</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>hapnik</translation> </message> @@ -8491,15 +8684,10 @@ Max</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> - <source>(%s) or (%s)</source> - <translation>(%s) või (%s)</translation> - </message> - <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>õhk</translation> </message> @@ -8509,27 +8697,27 @@ Max</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>integreeritud</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>vöö</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>pahkluu</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation>seljaplaat</translation> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>külgeriputatav</translation> </message> @@ -8712,23 +8900,23 @@ Max</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>tundmatu</translation> @@ -8870,93 +9058,93 @@ Max</translation> <translation>Viga gaasisegu tuvastamisel</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Ei saa luua parserit %s %s jaoks</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Viga andmete registreerimisel</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Viga proovide tuvastamisel</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Sündmus: ootan kasutaja sekkumist</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Viga sündmuste draiveri registreerimisel.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Viga tühistamise draiveri registreerimisel</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Viga sukeldumise andmete impordil</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Ei saa luua libdivecomputer konteksti</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Ei saa avada %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -8972,19 +9160,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation>Imelik protsendilugem %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation>'%s' tuvastamine ebaõnnestus</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation>Ei suuda avada stiililehte %s</translation> </message> @@ -9003,8 +9191,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation>Hoiatus:</translation> </message> @@ -9030,16 +9218,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation type="unfinished"/> @@ -9142,6 +9320,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>SAC</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9164,6 +9357,16 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> @@ -9209,22 +9412,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <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="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> @@ -9234,12 +9432,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Ei leia gaasi %s</translation> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9248,241 +9446,247 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1427"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation>Dekos </translation> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (arvutatud)</translation> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation>Dekos (arvutatud) </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (arvutatud)</translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (arvutatud) </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (arvutatud)</translation> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (arvutatud) </translation> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation>Arvutatud lagi %.0f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Kude %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation>Kurss: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation type="unfinished"/> </message> @@ -10342,22 +10546,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Linn</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1237"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> @@ -10370,117 +10574,117 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation>Sukeldumiste nimekiri</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation>Seaded</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation>Lisa sukeldumine käsitsi</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>Käsitsi sünkro pilvega</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation>Vallasrežiim</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation>Luba pilve automaatne sünkro</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation>Abi</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation>Lae GPS andmed üles</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Lae GPS andmed alla</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation>Näita GPS määrang</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation>Kustuta GPS vahemälu</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation>Arendaja</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation>Teema info</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation>Kohta</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation>Käivita positsioneerimise teenus</translation> </message> @@ -10583,51 +10787,56 @@ p, li { white-space: pre-wrap; } <translation>Planeerimine</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation>VPM-B deko</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation>Bühlmann deko</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation>Varugaas</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation>planeeri põhigaasi pausid</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>min</translation> </message> @@ -10647,153 +10856,153 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation>Lasku esimesele sügavusele</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> <source>Safety stop</source> <translation>Ohutuspeatus</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> <source>Conservatism level</source> <translation>Konservatiivsuse tase</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> + <translation>Sukeldumise liik</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation>Gaasi valikud</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>SAC põhjas</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation>Põhja pO₂</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Märkmed</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>Näita sukeldumise plaanis peatuste jooksvat (tõelist) aega</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation>Kuva jooksev aeg</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>Näita sukeldumiste plaanis peatuste pikkust (suhtelist aega)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation>Kuva segmendi kestust</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>Näita sukeldumiste plaanis üleminekuid või käsitle neid peidetuna</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation>Kuva üleminekud dekos</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation>Tekstiline sukeldumise plaan</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation>Deco pO₂</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation>Deko SAC</translation> </message> diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts index a9f1b18d1..564bf0fbd 100644 --- a/translations/subsurface_fi_FI.ts +++ b/translations/subsurface_fi_FI.ts @@ -2578,76 +2578,76 @@ GPS location:</source> <translation>Tallenna sukellus tiedostoon TeX -makroina.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Vienti UDDF -tiedostoon</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> <source>UDDF files</source> <translation>UDDF-tiedostot</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> <source>CSV files</source> <translation>CSV-tiedostot</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> <source>HTML files</source> <translation>HTML-tiedostot</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> <source>Subsurface files</source> <translation>Subsurfacen tiedostot</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>TeX files</source> <translation>TeX-tiedostot</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>Export CSV file as</source> <translation>Vienti CSV -tiedostoon</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export world map</source> <translation>Vie maailmankartta</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> <source>Export Subsurface XML</source> <translation>Vie Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Tallenna kuvien syvyydet</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Vie TeX -tiedostoon</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Vie HTML -tiedostoihin</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Odota, vienti kesken...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Tiedoston avaus ei onnistu %s</translation> </message> @@ -2988,41 +2988,61 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="157"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>tuntematon</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="192"/> - <location filename="../qt-models/diveplannermodel.cpp" line="277"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation>säiliö</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Lopullinen syvyys</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Käytetty kaasuseos</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="381"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>CC -asetuspiste</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3608,7 +3628,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Lataa</translation> </message> @@ -3634,7 +3654,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Peruuta</translation> </message> @@ -3664,37 +3684,37 @@ p, li { white-space: pre-wrap; } <translation>Yhteys:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Yritä uudestaan</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Lopeta</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>Ladatut sukellukset</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation>Tietoja:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Hyväksy</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Valitse kaikki</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Poista valinnat</translation> </message> @@ -4618,13 +4638,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>Peruuta</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>Tee uudelleen</translation> </message> @@ -4664,20 +4684,20 @@ p, li { white-space: pre-wrap; } <translation>Avaa pilvipalvelun verkkoyhteys</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="371"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="407"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Yhdistä</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="401"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Katkaise yhteys</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1593"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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> @@ -4688,39 +4708,39 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Peruuta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="629"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation>Älä tallenna tyhjää lokitiedostoa pilveen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="670"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Hae kuvia alihakemistoista</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Etsi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>Kuvien etsintä käynnissä...(tämä voi kestää kauan)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="707"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="858"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="968"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Varoitus</translation> </message> @@ -4730,12 +4750,12 @@ p, li { white-space: pre-wrap; } <translation>Yritetään yhdistää sukelluksia %1min "pinta-ajalla"</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> <source>Template backup created</source> <translation>Templaatista otettiin varmuuskopio</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>The following backup printing templates were created: %1 @@ -4758,202 +4778,202 @@ ei tule muokata suoraan, koska ne päivitettään automaattisesti uuden Subsurface-version myötä.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="732"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="858"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="910"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Tulosta sukellussuunnitelma</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="968"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Yritetään muokata sukellusta, joka ei ole sukellussuunnitelma.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Yrität muokata sukellusta, joka ei ole syötetty käsin.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1110"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Vuositilastot</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1331"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> <source>Dive log files</source> <translation>Sukelluslokit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1622"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> <source>Subsurface files</source> <translation>Subsurfacen tiedostot</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> <source>MkVI files</source> <translation>MkVI-tiedostot</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> <source>All files</source> <translation>Kaikki tiedostot</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <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="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Tallenna muutokset?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <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="../desktop-widgets/mainwindow.cpp" line="1621"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Tallenna nimellä</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1709"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[paikallinen cache] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1711"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[pilvitallennus] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1812"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>Avataan vanhan tiedostomuodon loki</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1813"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Avasit vanhan tiedostomuodon lokitiedoston. Suosittelemme, että luet uuden version muutoksista käyttöohjeesta, etenkin sukelluskohteiden hallinnasta, sillä se on muuttunut huomattavasti. Subsurface on jo yrittänyt esi-täyttää sijaintitiedot, mutta kannattaa vielä tarkistaa uudesta sukelluskohteiden hallinnasta, että kaikki tiedot ovat oikein.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Avaa sukellusloki</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>Otetaan yhteyttä pilvipalveluun...</translation> </message> @@ -5070,89 +5090,89 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Avoin kierto</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Viimeinen pysähdys 20 jalassa</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% keskisyvyydestä - 20 jalkaan</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20 jalasta pintaan</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Viimeinen pysähdys kuudessa metrissä</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% keskisyvyydestä - 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6m:stä pintaan</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>ft³/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -6014,17 +6034,17 @@ Tallenna muokkauksesi eri nimelle.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (#%1 / %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Tuntematon sukellustietokone</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Suoranousu-/pintautumisaikaa ei näytetä, koska niiden laskemiseen kuluu liikaa aikaa</translation> </message> @@ -6039,12 +6059,12 @@ Tallenna muokkauksesi eri nimelle.</translation> <translation>Aseta ensimmäiseksi sukellustietokoneeksi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation>Suunniteltu sukellus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation>Käsin lisätty sukellus</translation> </message> @@ -7243,32 +7263,32 @@ Files with inappropriate date/time</source> <translation>Valokuvat</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Lataa kuvia tiedostoista</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Lataa kuvia verkosta</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>Poista valitut kuvat</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>Poista kaikki kuvat</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>Poistetaan kuvia</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>Haluatko varmasti poistaa kaikki kuvat?</translation> </message> @@ -7850,24 +7870,24 @@ sekoittaa ilmasta ja käyttäen: <translation>Palvelin palautti seuraavan tiedon:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Tarkistetaan joka toinen viikko uuden version saatavuus. Mikäli et halua tarkistusta tehtävän, valitse kieltävä painike.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Kieltäydy</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Hyväksy</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Päivitysten automaattinen tarkistus</translation> </message> @@ -8591,8 +8611,8 @@ Keski</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1144"/> - <location filename="../core/planner.c" line="1147"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>happi</translation> </message> @@ -8679,8 +8699,8 @@ Keski</translation> <message> <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1140"/> - <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>ilma</translation> </message> @@ -9215,11 +9235,6 @@ Voit luoda tämän tiedoston valitsemalla kyseisen valinnan sukellusten lataus - <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation>Kesto: %dmin %s</translation> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Kesto: %dmin<br></div></translation> @@ -9365,6 +9380,11 @@ Voit luoda tämän tiedoston valitsemalla kyseisen valinnan sukellusten lataus - <translation>sukellussuunnitelma</b> (päällekkäisiä sukelluksia havaittu)</translation> </message> <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekomalli: Bühlmann ZHL-16C: GFLow = %d%% ja GFHigh = %d%%</translation> @@ -9430,7 +9450,7 @@ Voit luoda tämän tiedoston valitsemalla kyseisen valinnan sukellusten lataus - <translation>Seosta %s ei löydy</translation> </message> <message> - <location filename="../core/planner.c" line="1148"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> @@ -10626,11 +10646,6 @@ Onko Uemis Zurich kytketty oikein?</translation> <translation>Lataa sukellustietokoneelta</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="156"/> - <source>Apply GPS Fixes</source> - <translation>Käytä GPS-sijainteja</translation> - </message> - <message> <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>Synkronoi kerran pilvipalveluun</translation> @@ -10666,6 +10681,11 @@ Onko Uemis Zurich kytketty oikein?</translation> <translation>Vie GPS -tiedot</translation> </message> <message> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation>Käytä GPS-sijainteja</translation> + </message> + <message> <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Lataa GPS -tiedot</translation> diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index 6c472e2d9..d3bf49a8a 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -2579,76 +2579,76 @@ GPS actuelle :</translation> <translation>Sauvegarde la plongée en macro TeX dans un fichier.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Exporter le fichier UDDF en</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> <source>UDDF files</source> <translation>Fichiers UDDF</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> <source>CSV files</source> <translation>Fichiers CSV</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> <source>HTML files</source> <translation>Fichiers HTML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> <source>Subsurface files</source> <translation>Fichiers Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>TeX files</source> <translation>Fichiers TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>Export CSV file as</source> <translation>Exporter le fichier CSV en</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export world map</source> <translation>Exporter la carte mondiale</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> <source>Export Subsurface XML</source> <translation>Exporter vers fichier XML Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Sauvegarder la profondeur de l'image</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Exporter dans un fichier TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Exporter le fichier HTML comme</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Veuillez patienter, exportation...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Impossible d'ouvrir le fichier %s</translation> </message> @@ -2989,41 +2989,61 @@ GPS actuelle :</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="157"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>inconnu</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="192"/> - <location filename="../qt-models/diveplannermodel.cpp" line="277"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation>bloc</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Prof. finale</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Durée de plongée</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Gaz utilisés</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="381"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>Setpoint CC</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation>temps d'arrêts</translation> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3609,7 +3629,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Télécharger</translation> </message> @@ -3635,7 +3655,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Annuler</translation> </message> @@ -3665,37 +3685,37 @@ p, li { white-space: pre-wrap; } <translation>Connexion :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Réessayer</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Quitter</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>Plongées téléchargées</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation>Info :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Accepter</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Tout sélectionner</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Tout désélectionner</translation> </message> @@ -4620,13 +4640,13 @@ cette opération. Voulez-vous vraiment continuer ?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>&Annuler</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>&Refaire</translation> </message> @@ -4666,20 +4686,20 @@ cette opération. Voulez-vous vraiment continuer ?</translation> <translation>Passer en mode hors-ligne</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="371"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="407"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Se connecter à</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="401"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Se déconnecter de</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1593"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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> @@ -4690,39 +4710,39 @@ cette opération. Voulez-vous vraiment continuer ?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Annuler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="629"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation>Ne pas enregistrer un journal vide dans le cloud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="670"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Traverser les dossiers d'images</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Scanner</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>Analyse des images ... (merci de patienter)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="707"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="858"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="968"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Avertissement</translation> </message> @@ -4732,12 +4752,12 @@ cette opération. Voulez-vous vraiment continuer ?</translation> <translation>Tentative de fusion des plongées compris dans un intervalle de temps de %1 minutes</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> <source>Template backup created</source> <translation>Sauvegarde du modèle créée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>The following backup printing templates were created: %1 @@ -4760,202 +4780,202 @@ sont en lecture seule et ne doivent pas être modifiés directement, puisque l'application peut les écraser au démarrage.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="732"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="858"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="910"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Imprimer le tableau de runtime</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="968"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Tentative de replanification d'une plongée qui n'est pas une plongée planifiée.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Tentative de modification d'une plongée qui n'a pas été ajoutée manuellement.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1110"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Statistiques annuelles</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1331"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> <source>Dive log files</source> <translation>Fichiers de carnet de plongées</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1622"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> <source>Subsurface files</source> <translation>Fichiers Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> <source>MkVI files</source> <translation>Fichiers MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> <source>APD log viewer</source> <translation>Visualiseur de log APD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> <source>All files</source> <translation>Tous les fichiers</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <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="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Enregistrer les modifications ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <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="../desktop-widgets/mainwindow.cpp" line="1621"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Enregistrer le fichier sous</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1709"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[cache local pour] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1711"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[stockage dans le cloud pour] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1812"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>Ouverture du fichier de données à partir d'une version antérieure</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1813"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Vous avez ouvert un fichier de données d'une version plus ancienne de Subsurface. Nous vous recommandons de lire le manuel à propos des modifications apportées par la nouvelle version, particulièrement à propos de la gestion des sites de plongées qui a été grandement modifiée. Subsurface a déjà essayé de pré-remplir les données mais il est préférable que vous regardiez le nouveau système de gestion des sites de plongées pour vous assurer que tout est correct.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Ouvrir le fichier de carnet de plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>Contact du service cloud...</translation> </message> @@ -5072,89 +5092,89 @@ Si votre périphérique utilise le Bluetooth, effectuez la même préparation qu <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Circuit ouvert</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR (Recycleur)</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Dernier palier à 20 pieds</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% de la prof. moyenne à 20 pieds</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>de 20 pieds à la surface</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Dernier palier à 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% de la profondeur moyenne à 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>de 6m à la surface</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -6017,17 +6037,17 @@ Merci d'exporter ce modèle vers un fichier différent.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (n°%1 sur %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Ordinateur de plongée inconnu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>L'affichage de la LND/DTR est désactivée à cause d'un temps de calcul excessif</translation> </message> @@ -6042,12 +6062,12 @@ Merci d'exporter ce modèle vers un fichier différent.</translation> <translation>Choisir comme odinateur principale</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation>Plongée planifiée</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation>Plongée ajoutée manuellement </translation> </message> @@ -7248,32 +7268,32 @@ Fichiers avec dates/heures incorrectes</translation> <translation>Photos</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Charger le(s) image(s) à partir des fichier(s)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Charger le(s) image(s) à partir du web</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>Supprimer les images sélectionnées</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>Supprimer toutes les images</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>Suppression des images</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>Voulez-vous vraiment supprimer toutes les images?</translation> </message> @@ -7855,24 +7875,24 @@ mélangés à partir de l'air et en utilisant : <translation>Le serveur a renvoyé l'information suivante :</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface vérifie toutes les deux semaines si une nouvelle version est disponible. Si vous ne souhaitez plus que Subsurface fasse cette vérification, cliquez sur Refuser.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Refuser</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Accepter</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Vérification automatique des mises à jour</translation> </message> @@ -8598,8 +8618,8 @@ Maximum</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1144"/> - <location filename="../core/planner.c" line="1147"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>oxygène</translation> </message> @@ -8686,8 +8706,8 @@ Maximum</translation> <message> <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1140"/> - <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>air</translation> </message> @@ -9222,11 +9242,6 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation>Runtime : %dmin %s</translation> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime : %dmin<br></div></translation> @@ -9371,6 +9386,11 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans <translation>Planification de la plongée</b>(Chevauchement de plongées détecté)</translation> </message> <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation>Runtime : %dmin%s</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Modèle de déco : Bühlmann ZHL-16C avec GF Low = %d%% et GF High = %d%%</translation> @@ -9436,7 +9456,7 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans <translation>Impossible de trouver le gaz %s</translation> </message> <message> - <location filename="../core/planner.c" line="1148"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>nitrox</translation> </message> @@ -10634,11 +10654,6 @@ Est-ce que l'Uemis Zurich est branché correctement ?</translation> <translation>Télécharger depuis l'ordinateur de plongée</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="156"/> - <source>Apply GPS Fixes</source> - <translation>Appliquer les corrections GPS</translation> - </message> - <message> <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>Synchro manuelle avec le cloud</translation> @@ -10674,6 +10689,11 @@ Est-ce que l'Uemis Zurich est branché correctement ?</translation> <translation>Envoyer les données GPS</translation> </message> <message> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation>Appliquer les points GPS</translation> + </message> + <message> <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Télécharge les données de GPS</translation> diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts index 4d011ae81..17b3640a0 100644 --- a/translations/subsurface_he.ts +++ b/translations/subsurface_he.ts @@ -47,66 +47,86 @@ <translation>בחירת התקני Bluetooth מרוחקים</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>מכשירים שנמצאו</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>שמור</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>יציאה</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>סרוק</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>נקה</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>נתוני התקני Bluetooth מקומיים</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>שם:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>כתובת:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth פועל</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>כבה/הפעל</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>בחר מכשיר:</translation> @@ -117,22 +137,22 @@ <translation>שם:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation>לא היה ניתן לאתחל Winsock גרסה 2.2</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation>מנסה להדליק התקן Bluetooth מקומי...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation>מנסה לכבות התקן Bluetooth מקומי...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation>רשימת התקנים מרוחקים נוקתה.</translation> </message> @@ -164,22 +184,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation>נותק</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation>חובר</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation>מורשה מחובר</translation> </message> @@ -189,113 +209,113 @@ <translation>%1 (%2) [מצב: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>ניתן להשתמש בהתקן %1. ניתן ללחוץ על כפתור "שמור".</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>התקן %1 צריך להיות מחובר על מנת להשתמש בו. אנא השתמש בתפריט ההקשר לאפשרויות החיבור.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation>ההתקן המקומי השתנה.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation>חבר</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation>הסר חיבור</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation>מנסה לחבר התקן %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation>מנסה לנתק התקן %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation>התקן %1 מנותק.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation>התקן %1 מחובר.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation>התקן %1 מחובר ומורשה.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>אפשר להשתמש בהתקן %1 לחיבור. ניתן ללחוץ על כפתור שמור.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation>תקלה בהתקן מקומי: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>שגיאת חיבור. אם ההתקן המרוחק דורש קוד PIN, אנא נסה לשייך את המכשירים על ידי שימוש במערכת ההפעלה שלך.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation>תקלה לא מוכרת</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>מתאם Bluetooth כבוי, הפעל אותו לפני הפעלת סריקה.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>כתיבה להתקן או קריאה ממנו הסתיימה בתקלה.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation>תקלה לא מוכרת.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation>תקלת גילוי מכשיר: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>לא זמין</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>לא ניתן לגשת למתאם Bluetooth המקומי.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>סוכן גילוי המכשירים לא נוצר מכיוון שהכתובת %1 אינה תואמת את כתובת המתאם הפיסית של אף אחד מהתקני Bluetooth המקומיים.</translation> </message> @@ -316,7 +336,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>אין בני זוג</translation> </message> @@ -1636,84 +1656,84 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>גיבוי הגדרות מחשב הצלילה</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> - <translation>קבצי גיבוי (*.xml)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>תקלה בגיבוי XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>תקלה התרחשה בזמן שמירת קובץ גיבוי. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>גיבוי עבר בהצלחה</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>ההגדרות נשמרו ל: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>שחזר הגדרות של מחשב צלילה</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>תקלה בשחזור XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>תקלה התרחשה בזמן שחזור קובץ גיבוי. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>שחזור עבר בהצלחה</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>ההגדרות שחזרו בהצלחה.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>בחר קובץ קושחה</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> - <translation>כל קבצים (*.*)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> - <translation>בחר קובץ להורדת log מחשב הצלילה</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> - <translation>קבצי יומן (*.log)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> + <translation>בחר קובץ להורדת log מחשב הצלילה</translation> </message> </context> <context> @@ -1793,27 +1813,27 @@ <translation>ליטר</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>לחיצה פה תסיר את המיכל הזה</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>עומק מעבר לגז דקו. מחושב באמצעות העדפת דקו pO₂, אלא אם כן נקבע באופן ידני.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>מחושב באמצעות העדפת pO₂ תחתית. הגדרת MOD מתאים% ה- O₂, הגדיר '*' עבור ה- O₂% לעומק מרבי הטוב ביותר.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>מחושב באמצעות העדפת END Mix Best. הגדרת MND המתאים He%, הגדיר '*' עבור מיטב He% לעומק מרבי.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>הגז בשימוש. רק ניתן להסיר מיכלים שלא בשימוש בצלילה.</translation> </message> @@ -1926,27 +1946,27 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation>פרטי צלילה</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>מחיקת צלילה</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation>הצג במפה</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation>מספר בני זוג</translation> </message> @@ -1954,104 +1974,104 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation>צלילה מס' %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>תאריך:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>מיקום:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation>קואורדינטות:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation>השתמש במיקום GPS הנוכחי:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>עומק:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>משך הצלילה:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>טמפ' האוויר:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>טמפ' מים:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>חליפה:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>בן זוג:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>מדריך צלילה:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>משקל:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation>מיכל:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation>תערובת גז:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation>לחץ התחלתי:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation>לחץ סופי:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>דירוג</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>הערות:</translation> </message> @@ -2127,23 +2147,23 @@ GPS הנוכחי:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation>(מכל %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>מעבר ידני למערכת פתוחה</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation> התחלה</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation> סיום</translation> @@ -2308,12 +2328,12 @@ GPS הנוכחי:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>יצירת אתר צלילה חדש, העתקת מידע רלוונטי מהצלילה הנוכחית.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation>יצירת אתר צלילה חדש בשם זה</translation> </message> @@ -2558,76 +2578,76 @@ GPS הנוכחי:</translation> <translation>כתוב צלילה כפקודות מאקרו TeX לקובץ.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>היצוא קובץ UDDF כ-</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>UDDF קבצי (*.uddf *.UDDF)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <source>UDDF files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> - <translation>היצוא קובץ CSV כ-</translation> + <source>CSV files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <source>HTML files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>קבצי (*.csv *.CSV)CSV</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> - <translation>היצוא מפת העולם</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>TeX files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>קבצי HTML (*.html)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <source>Export CSV file as</source> + <translation>היצוא קובץ CSV כ-</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> - <translation>היצוא XML של Subsurface</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <source>Export world map</source> + <translation>היצוא מפת העולם</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>קבצי XML נתמכים (*.ssrf *.xml)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <source>Export Subsurface XML</source> + <translation>היצוא XML של Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>שמור עומק של תמונות</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>יצוא לקובץ TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> - <translation>קבצי TeX (*.tex)</translation> - </message> - <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>היצוא קובצי HTML כ-</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>אנא המתן, יצוא ...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>לא ניתן לפתוח קובץ %s</translation> </message> @@ -2922,7 +2942,7 @@ GPS הנוכחי:</translation> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation>מספר בני זוג</translation> </message> @@ -2968,41 +2988,61 @@ GPS הנוכחי:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>לא ידוע</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>עומק מירבי</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>זמן צלילה</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>משך הצלילה</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>גז שנוצל</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>נקודה קבועה למערכת סגורה</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>דקה</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>מטר</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>רגל</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3035,107 +3075,107 @@ GPS הנוכחי:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>עומק</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>זמן</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>לחץ</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>טמפרטורה</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>צבע</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>הוכנס על ידי המשתמש</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>לחץ S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>לחץ I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>תקרה</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>צריכת אויר</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>נקודה קבועה</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>חיישן 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>חיישן 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>חיישן 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>לחץ סביבתי</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>קצב לב</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>גרדיאנט</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>עומק ממוצע @ שניות</translation> </message> @@ -3456,71 +3496,71 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>הורדה</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation>בחר מצב הורדה ל-Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>שגיאה</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>חפש מחשב צלילה Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation>בטל הורדה</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation>בחר קובץ להורדת log מחשב הצלילה</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation>בחר קובץ לקובץ dump של divecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> - <translation>נסה הורדה שוב</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> - <translation>קבצי יומן (*.log)</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> + <translation>נסה הורדה שוב</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>אזהרה</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>שמירת dump של libdivecomputer לא להוריד צלילות לרשימת הצלילה.</translation> </message> - <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> - <translation>קבצי Dump (*.bin)</translation> - </message> </context> <context> <name>DownloadFromDiveComputer</name> @@ -3589,7 +3629,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>הורדה</translation> </message> @@ -3615,7 +3655,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>בטל</translation> </message> @@ -3645,37 +3685,37 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>נסה שוב</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>יציאה</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>צלילות שהורדו</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>אישור</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>בחר הכל</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>בטל בחירת הכל</translation> </message> @@ -3706,12 +3746,12 @@ p, li { white-space: pre-wrap; } <translation>להתחבר לפייסבוק מציין מיקום טקסט </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>על מנת לנתק Subsurface מחשבון הפייסבוק שלך, השתמש 'Share' בתפריט.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>כדי להתחבר לפייסבוק, אנא התחבר. זה מאפשר Subsurface לפרסם צלילות לציר הזמן שלך</translation> </message> @@ -3905,7 +3945,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation>מיקום לא מוגדר</translation> </message> @@ -3962,6 +4002,11 @@ p, li { white-space: pre-wrap; } <source>Country</source> <translation>מדינה</translation> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> + <translation type="unfinished"/> + </message> </context> <context> <name>LocationInformationModel</name> @@ -3985,29 +4030,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation>ניהול אתרי צלילה</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> <translation>מיזוג לתוך אתר הנוכחי</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> <translation>מיזוג אתרי צלילה</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation>אתה עומד למזג אתרי צלילה, אתה לא יכול לבטל את הפעולה הזו האם אתה בטוח שאתה רוצה להמשיך?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation>הנך עורך אתר צלילה</translation> </message> @@ -4025,8 +4070,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>הערות</translation> </message> @@ -4047,19 +4092,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>טמפ' האוויר</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>טמפ' המים</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>מיקום</translation> </message> @@ -4124,123 +4169,123 @@ p, li { white-space: pre-wrap; } <translation>משך הצלילה</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation>מידע נוסף</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>מידע נוסף</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation>סטטיסטיקות</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>תמונות</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation>שמור שינוים</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation>מחק שינוים</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>מיכלים</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation>הוסף מיכל</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>משקולות</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation>הוסף משקולות</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation>מערכת פתוחה</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation>מערכת סגורה</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation>מערכת חצי סגורה</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation>צלילה חופשית</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>טמפ' האוויר [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>טמפ' המים [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>טיול זה בעריכה</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>צלילות מרובות בעריכה.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>צלילה זו בעריכה.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>הערות</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>מיקום</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation>אתר צלילה חדש</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>בטל שינוים?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation>אתה עומד לבטל את השינויים.</translation> </message> @@ -4253,451 +4298,451 @@ p, li { white-space: pre-wrap; } <translation>&קובץ</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>&יומן</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>תצוגה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>&עזרה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>&ייבא</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation>ערוך</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> <translation>שתף ב-</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>יומן &חדש</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>חדש</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>&לפתוח יומן</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>פתח</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>&שמור</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>שמור</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>שמור בשם</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>שמור בשם</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>&סגור</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>סגור</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>&הדפס</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>הגדרות</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>&צא</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>יבוא ממחשב צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>יבא נתוני GPS משירות האינטרנט של Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> <translation>ערוך שמות של מכשירים</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>הוסף צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation>עריכת צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation>העתק רכיבי צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation>הדבק רכיבי צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>&מספר מחדש</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>קבץ אוטומטי</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>סטטיסטיקה שנתית</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>רשימת צלילות</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>פרופיל</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>פרטים</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>הכל</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation>מחשב צלילה קודם</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation>מחשב צלילה הבא</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>אודות Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation>מדריך משתמש</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>תכנן צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>יבא קובץ יומן צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>יבא קובץ יומן צלילה מתוכנה אחרת</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>יבוא מ- Divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>מסך מלא</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>הפעל/כבה מסך מלא</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation>בדוק עדכונים</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>יצוא</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation>יצוא יומני צלילה </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation>הגדרות מחשב צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation>עריכת צלילה במתכנן צלילות</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation>הצג/הסתר גרף pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation>הצג/הסתר גרף pN₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>הצג/הסתר גרף pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation>הצג/הסתר תקרה לפי מחשב צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation>הצג/הסתר תקרה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation>הפעל/כבה חישוב גזים ברקמות</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>הפעל/כבה תקרה מחושבת עם מרווחים של 3 מטרים</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>הצג/הסתר קצב לב</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>הצג/הסתר עומק מירבי</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>הצג/הסתר EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation>הצג/הסתר NDL, זמן לפני המים</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation>צריכת אויר</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation>הצג/הסתר סרגל</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation>שנה קנה מידה של הגרף</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation>הצג/הסתר תמונות</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> - <translation>הצג/הסתר גרף של גז פעיל</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation>סנן רשימת צלילות</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation>הצג/הסתר מפת חום רקמות</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation>סקר משתמשים</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>בטל שינוי</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>בצע שינוי שוב</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation>חפש תמונות שהועברו</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation>פתח אחסון בענן</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation>שמור לאחסון בענן</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation>ניהול אתרי צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation>ערוך אתר צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation>העבר אחסון בענן למצב פעיל</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>התחבר אל</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>התנתק מ-</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני פתיחת קובץ חדש.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>פתח קובץ</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>בטל</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>פצל ספריות של תמונת</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>סרוק</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>סורק תמונות... (יכול להיות תהליך ארוך)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>אזהרה</translation> </message> @@ -4707,105 +4752,221 @@ p, li { white-space: pre-wrap; } <translation>מנסה למזג צלילות עם מרווח של 1% דקות ביניהם</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני סגירת הקובץ.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני הוספת צלילה.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>הדפס טבלת זמנים</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>מנסה לערוך מחדש צלילה שאינה צלילה מתוכננת.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>ראשית סיים את המהדורה הנוכחית לפני יצירת אחרת.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>מנסה לערוך צלילה שלא הוספה ידנית.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>סטטיסטיקה שנתית</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>CSV</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>האם ברצונך לשמור שינויים בקובץ %1 ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>האם לשמור שינויים בקובץ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>שמור שינוים?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <source>Changes will be lost if you don't save them.</source> <translation>כל השינויים יאבדו אם לא תשמרו אותם.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>שמור קובץ בשם</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>קבצי XML נתמכים (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[עותק מקומי עבור] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[אחסון בענן ל-] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>פותח קובץ מגרסה ישנה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>אתה פתחת קובץ נתונים מגירסה ישנה יותר של Subsurface. אנו ממליצים לך לקרוא את המדריך כדי ללמוד על השינויים בגרסה החדשה, במיוחד על ניהול אתר צלילה שהשתנה רבות. Subsurface כבר ניסתה לאכלס מראש את הנתונים אבל כדאי לבחון את מערכת ניהול אתרי הצלילה החדשה ולוודא שהכל נראה תקין.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>פתח קובץ יומן צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation>קבצי יומני צלילה (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN*.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;קבצי Cochran (*.can *.CAN);;קבצי CSV (*.csv *.CSV);;קבצי DiveLog.de (*.dld *.DLD);;קבצי JDiveLog (*.jlb *.JLB);;קבצי Liquivision (*.lvd *.LVD);;קבצי MkVI (*.txt *.TXT);;קבצי Suunto (*.sde *.db *.SDE *.DB);;קבצי Divesoft (*.dlf *.DLF);;קבצי UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;קבצי XML (*.xml *.XML);;קבצי APD (*.apd *.APD);;קבצי Datatrak/WLog (*.log *.LOG);;קבצי OSTCtools (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;כל קבצים (*)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>מתחבר לאחסון בענן</translation> </message> @@ -4813,7 +4974,7 @@ Subsurface כבר ניסתה לאכלס מראש את הנתונים אבל כד <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4821,22 +4982,22 @@ Subsurface כבר ניסתה לאכלס מראש את הנתונים אבל כד <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4844,7 +5005,7 @@ Subsurface כבר ניסתה לאכלס מראש את הנתונים אבל כד <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4896,8 +5057,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> - <translation>קבצי קושחה (*.hex *.bin)</translation> + <source>Firmware files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4921,89 +5082,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>מערכת פתוחה</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>מערכת סגורה</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>מערכת חצי סגורה</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>רגל לדקה</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>תחנה אחרונה ב-20 רגל</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% עומק ממוצע ל-20 רגל</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20 רגל לפני המים</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>רגל</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>מטרים לדקה</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>עצירה אחרונה ב6 מ'</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% עומק ממוצע ל-6 מטר</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6 מטר לפני המים</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>מטר</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>רגל מעוקב לדקה</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ליטר לדקה</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -5117,8 +5278,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>קבצי XML נתמכים (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5332,33 +5493,33 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>פורמט תאריך</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation><html><head/><body><p>פורמט תאריך מועדף. בשימוש נפוץ שדות</p><p>d (יום בחודש)</p><p>ddd ( מקוצרשם של יום)</p><p>M (מספר חודש)</p><p>MMM (שם של חודש מקוצר)</p><p>yy/yyyy (שנה בת 2 או 4 ספרות)</p></body></html></translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation>השתמש בשפת ברירת המחדל</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation>משמש למקומות שבהם יש פחות מקום כדי להציג את התאריך המלא</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation>פורמט מקוצר</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation>פורמט זמן</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation><html><head/><body><p>פורמט זמן מועדף</p><p>שימוש נפוץ שדות</p><p>h (שעות בפורמט 12h)</p><p>H (שעות בפורמט 24h)</p><p>mm (דקות ב-2 ספרות)</p><p>ss (שניות ב-2 ספרות)</p><p>t/tt (a/p או am/pm)</p></body></html></translation> </message> @@ -5368,30 +5529,38 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>שפה</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation>נדרשת הפעלה מחדש</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>כדי לטעון שפה חדשה בצורה נכונה עליך להפעיל מחדש את Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation>תווים ליטראלים</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> - <translation>תוים שאינם מיוחדים בפורמט הזמן. -אלה ישומשו כפי שהם. יתכן וזו לא כוונתך. -ראה: http://doc.qt.io/qt-5/qdatetime.html#toString</translation> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5801,45 +5970,70 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and cannot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>יבא קובץ תבנית</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> - <translation>קבצי HTML (*.html)</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>יצא קבצי תבנית כ-</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation>לא ניתן לבטל פעולה זו!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>מחק תבנית: %1?</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation type="unfinished"/> </message> </context> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation>(#%1 מתוך %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>מחשב צלילה לא מוכר</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>הצגת NDL / TTS הושבתה בגלל זמן עיבוד חריג</translation> </message> @@ -5849,22 +6043,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>הוסף שינוי גז</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation>(מיכל %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>בחר מחשב צלילה ראשונה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation>צלילה מתוכננת</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation>צלילה הוזן ידנית</translation> </message> @@ -5874,6 +6063,11 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>מחק מחשב צלילה זה</translation> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation>(מכל %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>הוסף שינוי נקודה קבועה</translation> @@ -5906,8 +6100,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> - <translation>שינוי לחץ במיכל %1 (כרגע מחושב כ-%2)</translation> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> @@ -5953,147 +6147,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation>מתחיל...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation>עובד במצב של חוסר תקשורת עם הענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation>שגיאה בקריאת קובץ מקומי, מבטל</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation>אין פרטי זיהוי לענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation>נא להזין פרטי זיהוי חוקיים לענן.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>דואר אלקטרוני וסיסמא לאחסון בענן יכולים רק מורכבים מאותיות, מספרים, ו, '.' '-', '_', ו '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation>מנסה להתחבר לענן עם זיהוי חדש</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation>בודק זיהוי לענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation>אין תגובה משרת ענן כדי לאמת את האישורים</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>אין אפשרות להתחבר לענן - חשבון ענן לא מאומת</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation>זיהוי לענן לא חוקי</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>אין אפשרות להתחבר לענן: תקלה ביצירת קשר https</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation>אין אפשרות להתחבר לענן: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation>אין אפשרות להתחבר לענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation>שגיאת איחסון ענן: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>שגיאה בחיבור לשרת ענן, חוזר למצב של עבודה מקומית</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>חיבור לענן נוצר בהצלחה. אין צלילות ברשימת הצלילות.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> <translation>שעה</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>דקה</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation>שניות</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> <translation>נ"צ לא מוכר</translation> </message> @@ -6191,7 +6385,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>דקה</translation> </message> @@ -6199,7 +6393,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation>שעה</translation> </message> @@ -6207,7 +6401,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation>שניות</translation> </message> @@ -6534,8 +6728,8 @@ Not all images have timestamps in the range between </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> - <translation>קבצי תמונה (*.jpg *.jpeg)</translation> + <source>Image files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> @@ -6648,8 +6842,8 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> - <translation>יבא הודעות (שגיאות, אזהרות, וכו ')</translation> + <source>Import messages (errors, warnings, etc)</source> + <translation type="unfinished"/> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/> @@ -6658,81 +6852,87 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> - <translation>קבצי SmartTrak (*.slg *.SLG);;כל סוג של קבצים (*)</translation> + <source>SmartTrak files</source> + <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> - <translation>פתח קבצי Subsurface</translation> + <source>All files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> - <translation>קבצי Subsurface (*.ssrf *SSRF *.xml *.XML);;כל סוג של קבצים (*)</translation> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> + <translation>פתח קבצי Subsurface</translation> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation>בינוני</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation>תאריך צלילה: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation>משך: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>שעה</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>דקה</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation>אתר צלילה: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation>בן זוג: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation>דייבמאסטר: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation> @@ -6927,7 +7127,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation>חליפה לא מוגדרת</translation> </message> @@ -7053,32 +7253,32 @@ Files with inappropriate date/time</source> <translation>תמונות</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>טען תמונה/תמונות מ-קובץ/קבצים</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>טען תמונה/תמונות מהרשת</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>מחק תמונות נבחרות</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>מחק את כל התמונות</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>מחק תמונות</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>האם אתה באמת רוצה למחוק את כל התמונות?</translation> </message> @@ -7256,7 +7456,7 @@ mixed from Air and using: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>תגים ריקים</translation> </message> @@ -7660,24 +7860,24 @@ mixed from Air and using: <translation>השרת החזיר את המידע הבא:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface בודקת כל שבועיים אם גרסה חדשה זמינה. אם אתה לא רוצה ש-Subsurface תמשיך לבדוק, אנא לחץ על דחה.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>דחה</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>אישור</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>בדיקת עדכונים אוטומטית</translation> </message> @@ -7939,8 +8139,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation>אין תקלות</translation> </message> @@ -8064,21 +8264,12 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation>שגיאה בניתוח הכותרת</translation> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8409,8 +8600,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>חמצן</translation> </message> @@ -8495,15 +8686,10 @@ Maximum</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> - <source>(%s) or (%s)</source> - <translation>(%s) או (%s)</translation> - </message> - <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>אויר</translation> </message> @@ -8513,27 +8699,27 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>משולב</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>חגורה</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>קרסול</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation>פלטת גב</translation> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>נצמד</translation> </message> @@ -8716,23 +8902,23 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation>שגיאה בחיבור לאחסון בענן של Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation>שיבוט git של%s נכשל (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>לא ידוע</translation> @@ -8874,75 +9060,75 @@ Maximum</source> <translation>שגיאה בקריאת תערובת הגזים</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>לא מצליח להבין %s %s </translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>שגיאה ברישום המידע</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>שגיאה בקריאת נקודות דגימה</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>אירוע: מחכה לפעולה של המשתמש</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>שגיאה ברישום שגרת ניהול</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>שגיאה בעת רישום שגרת הביטול.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>שגיאת יבוא נתוני צלילה</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>לא ניתן לייצר אובייקט של libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>לא ניתן לפתוח את %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>מיקומי GPS מרובים לאתר צלילה זה; גם %s @@ -8950,19 +9136,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation>שם נוסף לאתר: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -8978,19 +9164,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>תקלה - %s - בקריאת צלילה %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation>קריאת אחוז מוזרה %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation>נכשל ניסיון לנתח '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation>לא ניתן לפתוח את גיליון העיצוב %s</translation> </message> @@ -9009,8 +9195,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation>אזהרה:</translation> </message> @@ -9036,16 +9222,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>זמן %dmin<br></div></translation> @@ -9148,6 +9324,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>צריכת אויר</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9170,6 +9361,16 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>תכנון צלילה</b> נוצר ב-</translation> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>מודל דקו: Bühlmann ZHL-16B עם גרדיאנט תחתון=%d%% וגרדיאנט עליון =%d%%</translation> @@ -9215,22 +9416,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>גז מינימלי הנדרש עבור העלייה כבר עולה על הלחץ ההתחלתי של המיכל!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s מ- <span style='color: red;'><b>%s</b></span>(%.0f%s/%.0f%s בעליה מתוכננת)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation>%.0f%s (%.0f%s בעליה מתוכננת) של <span style='color: red;'><b>%s</b></span></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <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="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>pO₂ נמוך %.2f ב- %d:%02u עם גז %s בעומק %.*f %s</translation> </message> @@ -9240,12 +9436,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>לא ניתן למצוא את הגז %s</translation> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9254,251 +9450,257 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation>צריכת גז: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>רעילות שייורית מקסימלית %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2f בר </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2f בר </translation> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2f בר </translation> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation>דקו: %u דקות @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>חנת בטיחות: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1427"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>תחנת בטיחות: זמן לא ידוע @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation>דקו: זמן לא ידוע @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation>בדקו </translation> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation>NDL: %u דקות </translation> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>TTS: %u דקות </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>דקו: %u דקות @ %.0f%s (מחושב) </translation> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation>בדקו (חישוב) </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation>NDL: %u דקות (מחושב) </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation>NDL: > שעתיים (מחושב) </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>TTS: %u דקות (מחושב) </translation> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation>TTS: > שעתיים (מחושב) </translation> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation>RBT: %u דקות </translation> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation>תקרה %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>רקמה %.0f דקות: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation>קצב לב: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation>כיוון: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation>עומק ממוצע לכאן %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation>%s צריכת גז:%.*f %s</translation> </message> @@ -10363,22 +10565,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>עיר</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1237"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> @@ -10391,117 +10593,117 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation>רשימת צלילות</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation>הגדרות</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation>הוסף צלילה ידנית</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>לסנכרן באופן ידני עם הענן</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation>מצב ללא חיבור לענן</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation>אפשר סנכרון ענן אוטומטי</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation>העלה נתוני GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>הורד נתוני GPS </translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation>הצג נ"צים שמורים</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation>מחק מטמון נתוני GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation>מפתח</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation>אירועי תוכנה</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation>פרטי אפיון</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation>אודות</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation>הפעל שירות מיקום</translation> </message> @@ -10604,51 +10806,56 @@ p, li { white-space: pre-wrap; } <translation>תכנון</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation>דקו VPM-B</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation>דקו ע"י אלגוריתם של Bühlmann</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation>גז רזרבי</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation>לדחות החלפת גז אם עצירה לא נדרשת</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation>להחליף גזים רק בתחנות הנדרשות</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation>תכנן הפסקות גזים</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>דקה</translation> </message> @@ -10668,153 +10875,153 @@ p, li { white-space: pre-wrap; } <translation>מצב ספורטיבי</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation>ירידה מהירה לעומק התחלתי</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> - <translation>משך מעבר גז מינימאלי</translation> - </message> - <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> <source>Safety stop</source> <translation>עצירת בטיחות</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> <source>Conservatism level</source> <translation>רמת שמרנות</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> + <translation>מצב צלילה</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation>הגדרות גזים</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation>ליטר לדקה</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>מטר</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation>מקדם SAC</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation>משמש לחישוב גז מינימלי. קחו לדוגמה שני צוללנים עם SAC מוגברת לאחר האירוע גמר גזים.</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation>זמן לפתרון בעיות</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation>משמש לחישוב גז מינימלי. זמן נוסף בעומק מקסימלי לאחר אירוע גמר גז.</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation>אנו מבססים את חישוב התמהיל הטוב ביותר. בחר עומק תמהיל הטוב ביותר בטבלה 'גזים זמינים' על ידי עומק גז הזנה, ואחריו "B" (תערובת טרימיקס הטוב ביותר) או "BN" (תערובת נייטרוקס הטובה ביותר)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>גרדיאנט תחתון</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>גרדיאנט עליון</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>צריכת גז בעומק מירבי</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation>pO₂ בתחתית</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation>התערובת הטובה ביותר ל-END</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>הערות</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>בתכנית צלילה, ריצת תכנית (זמן מוחלט) של תחנות</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation>הצג זמן צלילה</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>בתכנית צלילה, להראות משך (זמן יחסי) של תחנות</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation>הצג משך הקטע</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>בתכנית צלילה, לרשום מעברים או להתייחס אליהם כמובלעת</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation>הצג מעברים בדקו</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation>תכנון צלילה מפורט</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation>pO₂ בדקו</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation>צריכת גז בדקו</translation> </message> diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts index 0f93225c1..483b511f5 100644 --- a/translations/subsurface_hr_HR.ts +++ b/translations/subsurface_hr_HR.ts @@ -10548,11 +10548,6 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="156"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> @@ -10588,6 +10583,11 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation type="unfinished"/> diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts index 9760434c5..b8a82a9fc 100644 --- a/translations/subsurface_hu.ts +++ b/translations/subsurface_hu.ts @@ -10551,11 +10551,6 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="156"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> @@ -10591,6 +10586,11 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation type="unfinished"/> diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts index 218668aba..22d9610ef 100644 --- a/translations/subsurface_id.ts +++ b/translations/subsurface_id.ts @@ -10555,11 +10555,6 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="156"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> @@ -10595,6 +10590,11 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation type="unfinished"/> diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts index 29b25214a..374dd86af 100644 --- a/translations/subsurface_it_IT.ts +++ b/translations/subsurface_it_IT.ts @@ -2579,76 +2579,76 @@ del GPS:</translation> <translation>Salva immersione su file come TeX macros</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Esporta file UDDF come</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> <source>UDDF files</source> <translation>File UDDF</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> <source>CSV files</source> <translation>File CSV</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> <source>HTML files</source> <translation>File HTML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> <source>Subsurface files</source> <translation>File Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>TeX files</source> <translation>File TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>Export CSV file as</source> <translation>Esporta file CSV come</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export world map</source> <translation>Esporta il mappamondo</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> <source>Export Subsurface XML</source> <translation>Esporta Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Salva la profondità a cui sono state scattate le foto</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Esporta in TeX file</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Esporta file HTML come</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Prego attendere, esportazione in corso...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Non posso aprire il file %s</translation> </message> @@ -2989,41 +2989,61 @@ del GPS:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="157"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>sconosciuto</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="192"/> - <location filename="../qt-models/diveplannermodel.cpp" line="277"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation>bombola</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Profondità finale</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Run Time</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Durata</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Gas utilizzato</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="381"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation>Tempi di sosta</translation> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3609,7 +3629,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Download</translation> </message> @@ -3635,7 +3655,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Annulla</translation> </message> @@ -3665,37 +3685,37 @@ p, li { white-space: pre-wrap; } <translation>Connessione:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Riprova</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Esci</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>Immersioni scaricate</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Accetta</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Seleziona tutto</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Deseleziona tutto</translation> </message> @@ -4620,13 +4640,13 @@ Sei sicuro di voler continuare?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>&Annulla</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>&Ripeti</translation> </message> @@ -4666,20 +4686,20 @@ Sei sicuro di voler continuare?</translation> <translation>Porta la memoria cloud online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="371"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="407"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Connetti a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="401"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Disconnetti da</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1593"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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> @@ -4690,39 +4710,39 @@ Sei sicuro di voler continuare?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Annulla</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="629"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation>Non salvare un log vuoto nel cloud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="670"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Visita le cartelle delle immagini</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Scansione</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>Lettura delle immagine (può impiegarci parecchio)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="707"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="858"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="968"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Avviso</translation> </message> @@ -4732,12 +4752,12 @@ Sei sicuro di voler continuare?</translation> <translation>Sto cercando di unire delle immmersioni con un intervallo di %1min tra di loro</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> <source>Template backup created</source> <translation>Backup del modello creato</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>The following backup printing templates were created: %1 @@ -4760,202 +4780,202 @@ sono protetti in sola lettura e non dovrebbero essere modificati direttamente da li può sovrascrivere alla partenza.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="732"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="858"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="910"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Stampa la tabella con il runtime</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="968"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Si sta cercando di ripianificare una immersione che non è una immersione pianificata.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Sto cercando di modificare una immersione che non è stata creata manualmente.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1110"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Statistiche Annuali</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1331"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> <source>Dive log files</source> <translation>File di log delle immersioni</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1622"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> <source>Subsurface files</source> <translation>File Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> <source>MkVI files</source> <translation>File MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> <source>All files</source> <translation>Tutti i file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <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="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Salvo le modifiche?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <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="../desktop-widgets/mainwindow.cpp" line="1621"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Apri file come</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1709"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[cache locale for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1711"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[memoria cloud per] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1812"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>Apertura di un file di dati da una vecchia versione</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1813"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Hai aperto un file di dati da una vecchia versione di Subsurface. Ti consigliamo di leggere il manuale per approfondire le modifiche apportate alla nuova versione, con particolare riguardo alla gestione dei siti di immersione che è cambiata in modo significativo. Subsurface ha già cercato di convertire i dati in maniera automatica ma sarebbe il caso di dare un'occhiata alla gestione dei siti di immersione per controllare che tutto sia a posto.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Apri file di log immersioni</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>Sto contattando il servizio cloud...</translation> </message> @@ -5072,89 +5092,89 @@ Se il tuo strumento usa il Bluetooth, prima di eseguire l'aggiornamento, es <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Circuito aperto</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>piedi/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Ultima sosta a 20 piedi</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>Dal 50% della prof. media a 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20 piedi alla superficie</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Ultima sosta a 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>Dal 50% della prof. media a 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6m alla superficie</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -6017,17 +6037,17 @@ Per favore esporta questo modello in un file diverso.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation>(nº%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Computer sconosciuto</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>La visualizzazione NDL / TTS è stata disabilitata perchè i calcoli richiedono troppo tempo</translation> </message> @@ -6042,12 +6062,12 @@ Per favore esporta questo modello in un file diverso.</translation> <translation>Rendi il computer principale</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation>Immersione pianificata</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation>Immersione inserita manualmente</translation> </message> @@ -7249,32 +7269,32 @@ Files with inappropriate date/time</source> <translation>Foto</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Carica immagine(i) da file(s)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Carica immagine(i) dal web</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>Cancella le immagini selezionate</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>Cancella tutte le immagini</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>Sto cancellando le immagini</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>Sei sicuro di voler cancellare tutte le immagini?</translation> </message> @@ -7856,24 +7876,24 @@ mixati con aria e usando: <translation>Il server ha restituito le seguenti informazioni:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface sta controllando se esistono nuove versioni ogni due settimane. Se non vuoi che Subsurface continui a controllare scegli Rifiuta.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Rifiuta</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Accetta</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Controllo automatico degli aggiornamenti</translation> </message> @@ -8596,8 +8616,8 @@ Media</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1144"/> - <location filename="../core/planner.c" line="1147"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>ossigeno</translation> </message> @@ -8684,8 +8704,8 @@ Media</translation> <message> <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1140"/> - <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>aria</translation> </message> @@ -9221,11 +9241,6 @@ Puoi crearne uno selezionando il corrispondente checkbox nella maschera di downl <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation>Runtime: %dmin %s</translation> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime: %dmin<br></div></translation> @@ -9370,6 +9385,11 @@ Puoi crearne uno selezionando il corrispondente checkbox nella maschera di downl <translation>piano di immersione</b> (Trovate Immersioni che si sovrappongono)</translation> </message> <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation>Runtime: %dmin%s</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Modello decompressivo: Bühlmann ZHL-16C con GFLow = %d%% e GFHigh = %d%%</translation> @@ -9435,7 +9455,7 @@ Puoi crearne uno selezionando il corrispondente checkbox nella maschera di downl <translation>Non trovo il gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1148"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> @@ -10634,11 +10654,6 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <translation>Download dal computer di immersione</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="156"/> - <source>Apply GPS Fixes</source> - <translation>Applica i punti GPS</translation> - </message> - <message> <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>Sincronizzazione manuale con il cloud</translation> @@ -10674,6 +10689,11 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <translation>Carica dati GPS</translation> </message> <message> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation>Applica i punti GPS</translation> + </message> + <message> <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Scarica dati GPS</translation> diff --git a/translations/subsurface_lv_LV.ts b/translations/subsurface_lv_LV.ts index 337e519ed..2abbc7076 100644 --- a/translations/subsurface_lv_LV.ts +++ b/translations/subsurface_lv_LV.ts @@ -43,66 +43,86 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Saglabāt</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation type="unfinished"/> @@ -113,22 +133,22 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation type="unfinished"/> </message> @@ -160,22 +180,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation type="unfinished"/> </message> @@ -185,113 +205,113 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -312,7 +332,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -374,6 +394,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1624,82 +1652,82 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> - <translation>Žurnalēšanas faili (*.log)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1779,27 +1807,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>Noklikšķot šeit Jūs noņemsiet balonu.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Šī gāze jau ir pielietota. Var noņemt tikai tos cilindrus, kuri nav pielietoti niršanā.</translation> </message> @@ -1913,27 +1941,27 @@ likvidēt izvēlētus datorus?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -1941,103 +1969,103 @@ likvidēt izvēlētus datorus?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Datums:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Vieta:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Ilgums:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Gaisa temp.:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Ūdens temp.:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Kostīms:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Draugs:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Niršanas speciālists:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Novērtējums:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Piezīmes:</translation> </message> @@ -2045,67 +2073,67 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Kostīms:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Gaisa temp.:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Ūdens temp.:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Novērtējums:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Niršanas speciālists:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Draugs:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Piezīmes</translation> </message> @@ -2113,23 +2141,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation>sākums</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation>beigas</translation> @@ -2167,23 +2195,23 @@ GPS location:</source> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation type="unfinished"/> </message> @@ -2191,102 +2219,102 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Izvērst visu</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Savērst visu</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Savērst pārējus</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Noņemt niršanas reizi(-es) no ceļojuma</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Izveidot jaunu ceļojumu augšup</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Nekavējoties pievienot niršanu(-as) ceļojumam augšup</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Tūlītēji pievienot niršanu(-as) pie apakšēja ceļojuma</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Saplūdināt ceļojumu ar augšējo</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Saplūdināt ceļojumu ar apakšējo</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Izdzēst niršanu(-as)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Atzīmēt niršanu(-as) kā nepareizus</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Saplūdināt izvēlētas niršanas</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Pārnumurēt niršanu(-as)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Atvērt attēla failu</translation> </message> @@ -2294,12 +2322,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -2544,76 +2572,76 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Eksportēt UDDF failu kā</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>UDDF faili (*.uddf *.UDDF)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <source>UDDF files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> - <translation>Eksportēt CSV failu kā</translation> + <source>CSV files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <source>HTML files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>CSV faili (*.csv *.CSV)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> - <translation>Eksportēt pasaules karti</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>TeX files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>HTML faili (*.html)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <source>Export CSV file as</source> + <translation>Eksportēt CSV failu kā</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> - <translation>Eksportēt Subsurface XML</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <source>Export world map</source> + <translation>Eksportēt pasaules karti</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>XML faili (*.xml, *.ssrf)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <source>Export Subsurface XML</source> + <translation>Eksportēt Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Eksportēt HTML failus, kā</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Nevar atvērt failu %s</translation> </message> @@ -2908,7 +2936,7 @@ GPS location:</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -2954,35 +2982,61 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>nezināms</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Gala dziļums</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Izpildes laiks</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Ilgums</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Izm. gāze</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3015,112 +3069,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Dziļums</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Laiks</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Spiediens</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Temperatūra</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Krāsa</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Ievādīts lietotājs</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Balona indekss</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Spiedums S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Spiediens I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Maksimāla dekompr. pietura</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation type="unfinished"/> </message> @@ -3353,81 +3402,81 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Izdarīts</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Augšupielādē niršanas sarakstu...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Niršanas saraksta lejupielādēšana...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Lejupielādē %1 niršanas...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Lejupielādēšana pabeigta - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Bojāta lejupielādēšana</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Nevar atvērt arhīvu: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Augšupielādēšana ir pabeigta</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Augšupielādēšana neizdodas</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Sekmīga augšupielādēšana</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Pieteikšanās neizdevās</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Nevar noparsēt atbildi</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Kļūda: %1</translation> </message> @@ -3435,71 +3484,71 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Lejupielādēt</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Kļūda</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Atrast Uemis niršanas datoru</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> - <translation>Žurnalēšanas faili (*.log)</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Brīdinājums</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Saglabājot izraksti, niršanas NEsaglabājas niršanas sarakstā.</translation> </message> - <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> - <translation>Izraksta faili (*.bin)</translation> - </message> </context> <context> <name>DownloadFromDiveComputer</name> @@ -3568,7 +3617,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Lejupielādēt</translation> </message> @@ -3594,7 +3643,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Atcelt</translation> </message> @@ -3609,52 +3658,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Atkārtot</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3685,12 +3734,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3698,22 +3747,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3884,7 +3933,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3941,6 +3990,11 @@ p, li { white-space: pre-wrap; } <source>Country</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> + <translation type="unfinished"/> + </message> </context> <context> <name>LocationInformationModel</name> @@ -3964,28 +4018,28 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4003,8 +4057,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>Piezīmes</translation> </message> @@ -4025,19 +4079,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>Gaisa temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>Ūdens temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>Vieta</translation> </message> @@ -4102,123 +4156,123 @@ p, li { white-space: pre-wrap; } <translation>Ilgums</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>Informācija</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>Fotogrāfijas</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>Cilindri</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation>Pievienot cilindri</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>Sver</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>Gaisa temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>Ūdens temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>Ceļojuma rediģēšana.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>Daudzkārtīga ceļojumu rediģēšana.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>Niršanas rediģēšana.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>Ceļojuma piezīmes</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>Ceļojuma vieta</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>Atcelt izmaiņas?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation>Jūs taisāties atcelt izmaiņas.</translation> </message> @@ -4231,446 +4285,451 @@ p, li { white-space: pre-wrap; } <translation>&Fails</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>&Žurnāls</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>&Skats</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>&Palīdzība</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>&Imports</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>&Jauns žunāls</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>Jauns</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>&Atvērt žurnālu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>Atvērt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>&Saglabāt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>Saglabāt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>Saglabāt kā</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>Saglabāt kā</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>Aizvērt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>Aizvērt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>&Drukāt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>Preferences</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>&Pabeigt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>Importēt no &niršanas datora</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importēt &GPS datus no Subsurface servissa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>&Pievienot niršanu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>&Pārnumurēt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>&Auto-grupēšana</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>&Gada statistika</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>&Niršanas saraksts</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>Profils</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>Info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>Visi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation>Nākamais DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>Par Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>Plānotājs</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>&Importēt žurnalēšanas failu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>Importēt žurnālus no citām programmām</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>Importēt &no divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>Pilnekrāns</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>Pārslēgt pilnekrāna režīmu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation> &Pārbaudīt atjaunāšanas</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>Eksports</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>Pārslēgt pHe grafiku</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>Pārslēgt pulsu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>Pārslēgt MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>Pārslēgt EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation>Pārslēgt NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>Atvērt failu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Atcelt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Brīdinājums</translation> </message> @@ -4680,104 +4739,220 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Izdrukāt niršanas tabulu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Gada statistika</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>CSV</source> + <translation>CSV</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <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="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Saglabāt izmaiņas?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <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="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Saglabāt kā</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML datnes (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Atvērt niršanas žurnālu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4785,7 +4960,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4793,22 +4968,22 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4816,7 +4991,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4866,7 +5041,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> + <source>Firmware files</source> <translation type="unfinished"/> </message> </context> @@ -4891,89 +5066,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Pēdējā pietura pie 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Pēdējā pietura pie 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -5087,8 +5262,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML datnes (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5100,32 +5275,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> + <source>Dive site layout</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation type="unfinished"/> </message> @@ -5322,33 +5477,33 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation type="unfinished"/> </message> @@ -5358,27 +5513,37 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Valoda</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation>Ir nepieciešams restarts</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Lai pareizi atspoguļotu jaunu valodu Jums jārestartē Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> <translation type="unfinished"/> </message> </context> @@ -5427,7 +5592,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation type="unfinished"/> </message> @@ -5508,6 +5673,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5778,152 +5953,177 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and cannot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> - <source>HTML files (*.html)</source> - <translation>HTML faili (*.html)</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> - <source>Delete template: %1?</source> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> <translation type="unfinished"/> </message> </context> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation>(#%1 no %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Pievienot gāzes maiņu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> - <source> (Tank %1)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Pievienot grāmatzīmi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Noņemt notikumu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Paslēpt līdzīgus notikumus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Rediģēt vārdu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Parādīt visus notikumus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Paslēpt notikumus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Paslēpt visus %1 notikumus?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Nodzēst izvēlēto notikumu?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Rediģēt grāmatzīmes vārdu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Vārds:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -5931,147 +6131,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6169,7 +6369,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6177,7 +6377,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation type="unfinished"/> </message> @@ -6185,7 +6385,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation type="unfinished"/> </message> @@ -6229,6 +6429,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Malformed XML response. Line %1: %2</source> <translation>Kļūdaina XML atbilde. Līnija %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Tagi</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6500,7 +6710,7 @@ Not all images have timestamps in the range between </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> + <source>Image files</source> <translation type="unfinished"/> </message> <message> @@ -6614,7 +6824,7 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> + <source>Import messages (errors, warnings, etc)</source> <translation type="unfinished"/> </message> <message> @@ -6624,76 +6834,82 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> + <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> <translation type="unfinished"/> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation type="unfinished"/> @@ -6785,12 +7001,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -6887,7 +7103,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7013,32 +7229,32 @@ Files with inappropriate date/time</source> <translation>Fotogrāfijas</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation type="unfinished"/> </message> @@ -7214,7 +7430,7 @@ mixed from Air and using: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation type="unfinished"/> </message> @@ -7413,7 +7629,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -7618,23 +7834,23 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation type="unfinished"/> </message> @@ -7893,8 +8109,8 @@ Valoda: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8018,21 +8234,12 @@ Vidējais</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8363,8 +8570,8 @@ Vidējais</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8449,15 +8656,10 @@ Vidējais</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> - <source>(%s) or (%s)</source> - <translation>(%s) vai (%s)</translation> - </message> - <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>gaiss</translation> </message> @@ -8467,27 +8669,27 @@ Vidējais</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>integrēts</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>josta</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>svars uz kājām</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8670,23 +8872,23 @@ Vidējais</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>nezināms</translation> @@ -8828,93 +9030,93 @@ Vidējais</translation> <translation>Kļūda parsējot gāzes maisījumu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <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="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Kļūda reģistrējot datus</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Kļūda parsējot paraugus</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Notikums: gaida lietotāja darbību</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Kļūda reģistrējot notikumu apstrādātāju.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Error registering the cancellation handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Kļūda importējot niršanas datus</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Nav iespējams izveidot libdivecomputer kontekstu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Nevar atvērt %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -8930,19 +9132,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation>Dīvaina procentu nolasīšana %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation>Kļūme parsējot '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation>Nevar atvērts stila lapu %s</translation> </message> @@ -8958,21 +9160,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation>Brīdinājums:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation type="unfinished"/> @@ -8988,200 +9190,226 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>dziļums</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>ilgums</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>izpildlaiks</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>gāze</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <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="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <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="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Pārslēgt gāzi uz %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="486"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Nevar atrast gāzi %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9190,122 +9418,128 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation>L: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation>Ā: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation>Dekompr.: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1427"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation>Dekompresijā </translation> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>TTS: %umin @@ -9314,120 +9548,120 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Dekompr.: %umin @ %.0f%s (izrēķ.) </translation> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation>Dekompresijā (izrēķ.) </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (izrēķ.) </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (izrēķ.) </translation> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation>Aprēķināta maks. dekompr. pietura %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation>azimuts: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation type="unfinished"/> </message> @@ -9766,6 +10000,31 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation type="unfinished"/> @@ -9801,97 +10060,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(nav niršanas)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Svēt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Pirm</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Otr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Treš</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Cet</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Piekt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Sest</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Maijs</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Jūn</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Jūl</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -10116,6 +10375,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Ilgums:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10221,7 +10481,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Dziļums</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation type="unfinished"/> </message> @@ -10261,22 +10521,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> @@ -10289,117 +10549,117 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation type="unfinished"/> </message> @@ -10502,51 +10762,56 @@ p, li { white-space: pre-wrap; } <translation>Plānošana</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>min</translation> </message> @@ -10566,153 +10831,153 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> + <source>Safety stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> - <source>Safety stop</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> + <source>Conservatism level</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> - <source>Conservatism level</source> + <source>+</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> - <source>+</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation>Gāzes opcijas</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>Apakšējais SAC</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation>Apakšējais pO₂</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Piezīmes</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation>Izrādīt izpildlaiku</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation>Deko pO₂</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation>Deko SAC</translation> </message> diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index e64df1f6b..3b0dd669c 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -46,66 +46,86 @@ <translation>Valg av bluetooth-enhet</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Oppdagede enheter</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Lagre</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Avslutt</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Fjern</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Detaljer for lokal bluetooth-enhet</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Navn:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Adresse:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth er påskrudd</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Skru av/på</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Velg enhet:</translation> @@ -116,22 +136,22 @@ <translation>Navn:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation>Kunne ikke starte Winsock version 2.2</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation>Prøver å skru på lokal bluetooth-enhet...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation>Prøver å skru av lokal bluetooth-enhet...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation>Enhetsliste ble slettet.</translation> </message> @@ -163,22 +183,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation>UNPAIRED</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation>PAIRED</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTHORIZED_PAIRED</translation> </message> @@ -188,113 +208,113 @@ <translation>%1 (%2) [Tilstand: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Enheten %1 kan brukes. Trykk "Lagre"-knappen.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Enheten %1 må pares for å bli bruk. Bruk menyen for paringsvalg.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation>En tom adresse kan ikke brukes for en enhetstilkobling</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation>Den lokale enheten ble endret.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation>Par</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation>Fjern paring</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation>Prøver å pare %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation>Prøver å fjerne paring for %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation>Fjernet paring for %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation>%1 er paret.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation>%1 ble paret og er autorisert.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>%1 kan nå bli bruk til forbindelse. Trykk "Lagre"-knappen.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation>Enhetsfeil: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Paringsfeil. Hvis enheten krever en spesiell PIN-kode, prøv å pare den ved hjelp av operativsystemet.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation>Ukjent feil</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Bluetoothadapteren er avskrudd, skru den på før søk.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Feil ved skriving til eller lesing fra enheten.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation>En ukjent feil inntraff.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation>Feil ved søk etter enhet: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>Ikke tilgjengelig</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Den lokale bluetooth-adapteren er ikke tilgjengelig.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Søkeagenten ble ikke opprettet siden adressen %1 ikke stemmer overens med den fysiske adressen til noen av de lokale bluetooth-enhetene.</translation> </message> @@ -315,7 +335,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>Ingen buddyer</translation> </message> @@ -1635,84 +1655,84 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Backupinnstillinger for computer</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> - <translation>Backupfil (*.xml)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>Feil ved XML-backup</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>En feil inntraff under lagring av backupfila. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Backup OK</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>Instillingene ble lagret til: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Gjenopprett computerinnstillinger</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>Feil ved gjenoppretting fra XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>En feil inntraff ved gjenoppretting av backupfila. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>Gjenoppretting OK</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>Innstillingene dine har blitt gjenopprettet.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Velg firmware-fil</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> - <translation>Alle filer (*.*)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> - <translation>Velg loggfil for nedlasting fra dykkecomputer</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> - <translation>Loggfiler (*.log)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> + <translation>Velg loggfil for nedlasting fra dykkecomputer</translation> </message> </context> <context> @@ -1792,27 +1812,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>Klikk her for å fjerne denne flaska.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Dybde for bytte av dekogass. Kalkulert ved hjelp av valgt deko-pO₂, hvis den ikke er satt manuelt.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Utregnet fra valgt bunn-pO₂. Ved å sette MOD justeres O₂%. Sett til '*' for best O₂% ved maks dybde.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Utregnet for valgt best miks END. Ved å sette MND justeres He%. Sett til '*' for best He% ved maks dybde.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Gassen er i bruk. Bare flasker som ikke er i bruk kan fjernes.</translation> </message> @@ -1925,27 +1945,27 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation>Detaljer for dyk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Slett dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation>Avbryt redigering</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation>Vis på kart</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation>Flere buddies</translation> </message> @@ -1953,104 +1973,104 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation>Dykk %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Dato:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Sted:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation>Koordinater:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation>Bruk nåværende GPS-posisjon:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Dybde:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Lengde:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Lufttemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Vanntemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Drakt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Dykkeleder:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Vekt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation>Flaske:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation>Gassmiks:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation>Starttrykk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation>Sluttrykk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Notater:</translation> </message> @@ -2126,23 +2146,23 @@ GPS-posisjon:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation>(flaske %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>Manuelt bytte til OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation> start</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation> slutt</translation> @@ -2307,12 +2327,12 @@ GPS-posisjon:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Lag et nytt dykkested, og kopier relevant informasjon fra dette dykket</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation>Opprett dykkested med dette navnet</translation> </message> @@ -2557,76 +2577,76 @@ GPS-posisjon:</translation> <translation>Lagre dykk som TeX-makroer til fil.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Eksporter UDDF-filer som</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>UDDF-filer (*.uddf *.UDDF)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <source>UDDF files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> - <translation>Eksporter CSV-file som</translation> + <source>CSV files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <source>HTML files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>CSV-filer (*.csv *.CSV)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> - <translation>Eksporter verdenskart</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>TeX files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>HTML-filer (*.html)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <source>Export CSV file as</source> + <translation>Eksporter CSV-file som</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> - <translation>Eksporter Subsurface XML</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <source>Export world map</source> + <translation>Eksporter verdenskart</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>XML-filer (*.xml *.ssrf)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <source>Export Subsurface XML</source> + <translation>Eksporter Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Lagre dybdedata fra bilder </translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Eksporter til TeX-fil</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> - <translation>TeX-filer (*.tex)</translation> - </message> - <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Eksporter HTML-filer som</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Vent, eksporterer...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Klarer ikke åpne fila %s</translation> </message> @@ -2921,7 +2941,7 @@ GPS-posisjon:</translation> <translation><numerusform>(%n dykk)</numerusform><numerusform>(%n dykk)</numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation>Flere buddies</translation> </message> @@ -2967,41 +2987,61 @@ GPS-posisjon:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>ukjent</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Siste dybde</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Løpetid</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Gassforbruk</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>CC settpunkt</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3034,107 +3074,107 @@ GPS-posisjon:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Trykk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Farge</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Brukeren la inn</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Trykk S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Trykk I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Tak</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Settpunkt</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Omgivelsestrykk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>Hjertefrekvens</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>Gradientfaktor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>Snittdypde @ s</translation> </message> @@ -3454,71 +3494,71 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Last ned</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation>Velg nedlastingsmåte for Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation>Kobler til dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Feil</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Finn Uemis dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation>Avbryt nedlasting</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation>Velg loggfil for nedlasting fra dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation>Velg binær dumpfil for nedlasting fra dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> - <translation>Prøv nedlasting på nytt</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> - <translation>Loggfiler (*.log)</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> + <translation>Prøv nedlasting på nytt</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Lagring av dump fra libdivecomputer vil IKKE laste ned dykk til dykkeloggen.</translation> </message> - <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> - <translation>Dumpfiler (*.bin)</translation> - </message> </context> <context> <name>DownloadFromDiveComputer</name> @@ -3587,7 +3627,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Last ned</translation> </message> @@ -3613,7 +3653,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -3643,37 +3683,37 @@ p, li { white-space: pre-wrap; } <translation>Forbindelse:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Prøv igjen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Avslutt</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>Nedlastede dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>OK</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Velg alle</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Velg ingen</translation> </message> @@ -3704,12 +3744,12 @@ p, li { white-space: pre-wrap; } <translation>Koble til Facebook text placeholder</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Bruk "Del på"-menyen for å koble Subsurface fra Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Logg inn for å koble til Facebook. Dette gjør at Subsurface kan poste dykk på veggen din</translation> </message> @@ -3903,7 +3943,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation>Ingen sted er satt</translation> </message> @@ -3960,6 +4000,11 @@ p, li { white-space: pre-wrap; } <source>Country</source> <translation>Land</translation> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> + <translation type="unfinished"/> + </message> </context> <context> <name>LocationInformationModel</name> @@ -3983,29 +4028,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation>Dykkestedsdatabase</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> <translation>Slå sammen med gjeldende dykkested</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> <translation>Slå sammen steder</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation>Du er i ferd med å slå sammen steder, og du kan ikke angre Er du sikker på at du vil fortsette?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation>Du redigerer et dykkested</translation> </message> @@ -4023,8 +4068,8 @@ Er du sikker på at du vil fortsette?</translation> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>Notater</translation> </message> @@ -4045,19 +4090,19 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>Vanntemp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>Sted</translation> </message> @@ -4122,123 +4167,123 @@ Er du sikker på at du vil fortsette?</translation> <translation>Varighet</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation>Ekstra info</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>Informasjon</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation>Statistikk</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>Bilder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation>Bruk endringene</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation>Forkast endringene</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>Flasker</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation>Legg til flaske</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>Vekter</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation>Legg til vektsystem</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation>OC</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation>Fridykk</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>Lufttemp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>Vanntemp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>Denne turen redigeres.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>Flere dykk redigeres.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>Dette dykket redigeres.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>Turnotater</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>Tursted</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation>Nytt dykkested</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>Slette endringer?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation>Du er i ferd med å droppe endringene dine.</translation> </message> @@ -4251,451 +4296,451 @@ Er du sikker på at du vil fortsette?</translation> <translation>&Fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>&Logg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>&Vis</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>&Hjelp</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>&Importer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation>R&ediger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> <translation>Del på</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>&Ny loggbok</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>Ny</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>Åpne l&oggbok</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>Åpne</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>Lagre</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>Lagre</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>Lagre som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>Lagre som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>Lukk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>Lukk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>Skriv ut</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>Valg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>Avslutt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>Importer fra &dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importer &GPS-data fra Subsurface webtjeneste</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> <translation>Rediger device&navn</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>Legg til dykk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation>R&ediger dykk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation>Kopier dykkekomponenter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation>Lim inn dykkekomponenter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>Nummere&r på nytt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>Auto&grupper</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>&Dykkeliste</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>&Alle</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation>Fo&rrige computer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation>&Neste computer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>Om Subsurf&ace</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation>Bruker&manual</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> <translation>Kart</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>P&lanlegg dykk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>&Importer loggfiler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>Importer dykkelogg fra andre programmer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>Importer &fra divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>&Fullskjerm</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>Fullskjerm av/på</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation>Se etter oppdateringer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>&Eksport</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation>Eksporter dykkelogger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation>Konfigurer &dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation>Rediger &dykk i planlegger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation>Skru av/på pO₂-graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation>Skru av/på pN₂-graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>Skru pHe-graf av/på</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation>Skru av/på dekograf fra computer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation>Skru av/på dekograf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation>Skru av/på utregning av vev</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Skru av/på 3m-inkrementer for dekotak</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>Skru av/på hjertefrekvens</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>Skru av/på MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>Skru av/på EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation>Skru av/på NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation>Skru av/på SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation>Skru av/på linjal</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation>Skaler graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation>Skru av/på bilder</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> - <translation>Skru av/på tank-linjen</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation>&Filtrer dykkeliste</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation>Slå heap-map av/på</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation>Brukerunder&søkelse</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>Angre</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>Gjør om</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation>&Finn bilder som er flyttet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation>Åpne skylager</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation>Lagre til skylager</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation>Dykkestedsdatabase</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation>R&ediger dykkested</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation>Skru skylagring på</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Koble til</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Koble fra</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>Åpne fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Gå gjennom bildekataloger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>Går gjennom bilder... (dette kan ta en stund)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Advarsel</translation> </message> @@ -4705,105 +4750,221 @@ Er du sikker på at du vil fortsette?</translation> <translation>Prøver å slå sammen dykk med %1min intervall mellom</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Skriv ut løpetidstabel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Prøver å re-planlegge et dykk som ikke allerede er et planlagt dykk.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Prøver å redigere et dykk som ikke er lagt til manuelt.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>CSV</source> + <translation>CSV</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <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="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Lagre endringer?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <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="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Lagre fil som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[lokal cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[skylager for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>Åpner datafil fra eldre versjon</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Du åpnet en datafil fra en eldre versjon av Subsurface. Vi anbefaler at du leser manualen for å else om endringene i den nye versjonen, særlig med tanke på dykkestedsdatabasen. Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på dykkestedsdatabasen og sjekke at alt er greit.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Åpne dykkelogg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation>Loggfiler (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran-filer (*.can *.CAN);;CSV-filer (*.csv *.CSV);;DiveLog.de-filer (*.dld *.DLD);;JDiveLog-filer (*.jlb *.JLB);;Liquivision-filer (*.lvd *.LVD);;MkVI-filer (*.txt *.TXT);;Suunto-filer (*.sde *.db *.SDE *.DB);;Divesoft-filer (*.dlf *.DLF);;UDDF/UDCF-filer (*.uddf *.udcf *.UDDF *.UDCF);;XML-filer (*.xml *.XML);;APD log-filer (*.apd *.APD);;Datatrak/WLog-filer (*.log *.LOG);;OSTCtools-filer (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Alle filer (*)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>Kontakter skylager...</translation> </message> @@ -4811,7 +4972,7 @@ Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation>Dra valgte dykkested</translation> </message> @@ -4819,22 +4980,22 @@ Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation>Åpne sted i Google Maps</translation> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation>Kopier sted (desimal)</translation> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation>Kopier sted (seksagesimalt)</translation> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation>Velg synlige dykkesteder</translation> </message> @@ -4842,7 +5003,7 @@ Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation>MapWidget.qml kunne ikke lastes! @@ -4895,8 +5056,8 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> - <translation>Firmware-filer (*.hex *.bin)</translation> + <source>Firmware files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4920,89 +5081,89 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Åpent system</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Siste stopp ved 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% av snittdybde til 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20ft til overflaten</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Siste stopp ved 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% av snittdybde til 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6m til overflaten</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>ft³/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -5116,8 +5277,8 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5331,33 +5492,33 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <translation>Datoformat</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation><html><head/><body><p>Foretrukket datoformat. Ofte brukte felter er</p><p>d (dag i måned)</p><p>ddd (fortkortet dagsnavn)</p><p>M (månedsnummer)</p><p>MMM (forkortet månedsnavn)</p><p>yy/yyyy (år med 2/4 sifre)</p></body></html></translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation>Bruk standard språk</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation>Dette brukes på steder der det er for liten plass til å vise full dato</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation>Kort format</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation>Tidsformat</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation><html><head/><body><p>Foretrukket tidsformat</p><p>Ofte brukte formater er</p><p>h (timer i 12-timersformat)</p><p>H (timer i 24-timersformat)</p><p>mm (minutter med 2 tall)</p><p>ss (sekunder med 2 tall)</p><p>t/tt (a/p eller am/pm)</p></body></html></translation> </message> @@ -5367,30 +5528,38 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <translation>Språk</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation>Programmet må startes på nytt</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>For å bytte språk må du starte Subsurface på nytt.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation>Bokstavelige tegn</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> - <translation>Uspesifikke ten i tidsformat. -Disse vil blir brukt som de er. Det er mulig at du ikke ville dette. -Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5800,45 +5969,70 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and cannot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>Importer mal</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> - <translation>HTML-filer (*.html)</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>Eksporter mal som</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation>Dette kan ikke gjøres om!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>Slette mal: %1?</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation type="unfinished"/> </message> </context> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (#%1 av %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Ukjent computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Funksjonen Vis NDL/TTS ble avskrudd siden den brukte for mye ressurser</translation> </message> @@ -5848,22 +6042,17 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Legg til gassbytte</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation>(Tank %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Velg som første dykkecomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation>Planlagt dyk</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation>Dykk lagt til manuelt</translation> </message> @@ -5873,6 +6062,11 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Slett denne computeren</translation> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation>(flaske %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Legg til endring av setpoint</translation> @@ -5905,8 +6099,8 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> - <translation>Juster trykket i tank %1 (nå er den satt til %2)</translation> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> @@ -5952,147 +6146,147 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation>Starter...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation>Åpne lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation>Kunne ikke åpne lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 dykk hentet fra lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation>jobber i ikke-sky-modus</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation>Klarte ikke å lese fra lokalt lagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation>ingen påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation>Legg in påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Epost og passord for skylager kan bare bestå av bokstaver, tall og '.', '-', '_', og '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> <translation>Feil format på epostadresse</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Prøver å åpne skylagring med nye påloggingsdetaljer</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation>Tester påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation>Skytjener svarte ikke ved validering av påloggingsdetaljer</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> <translation>Feil bruker/passord for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Får ikke koblet til skylagring - konto er ikke verifisert</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation>Påloggingsdetaljer for skyen er ugyldige</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Kunne ikke åpne skylagring: Feil ved opprettelse av https-forbindelse</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation>Kan ikke åpne skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation>Kan ikke koble til skylagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation>Gyldig bruker/passord, henter dykk</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation>Feil i skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Henter dykk fra lokalt lager ('ikke-sky-modus")</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Fikk ikke koblet til skylagring, skrur tilbake til lokal modus</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Tilkobling til skylagring OK. Ingen dykk i lista.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> <translation>Ukjent GPS-posisjon</translation> </message> @@ -6190,7 +6384,7 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6198,7 +6392,7 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation>t</translation> </message> @@ -6206,7 +6400,7 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation>sek</translation> </message> @@ -6533,8 +6727,8 @@ valgte dykk. </translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> - <translation>Bildefiler (*.jpg *.jpeg)</translation> + <source>Image files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> @@ -6648,8 +6842,8 @@ Filer med upassende dykkedato/-tid</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> - <translation>Importer meldinger (feil, advarsler, osv)</translation> + <source>Import messages (errors, warnings, etc)</source> + <translation type="unfinished"/> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/> @@ -6658,81 +6852,87 @@ Filer med upassende dykkedato/-tid</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> - <translation>SmartTrak-filer (*.slg *.SLG);;Alle filer (*)</translation> + <source>SmartTrak files</source> + <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> - <translation>Åpne Subsurface-filer</translation> + <source>All files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> - <translation>Subsurface-filer (*.ssrf *SSRF *.xml *.XML);;Alle filer (*)</translation> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> + <translation>Åpne Subsurface-filer</translation> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation>Liten</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation>Medium</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation>Dato: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation>Varighet: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>t</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation>Sted: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation>Buddy: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation>Dykkeleder: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation> @@ -6927,7 +7127,7 @@ Filer med upassende dykkedato/-tid</translation> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation>Ingen drakt er satt</translation> </message> @@ -7053,32 +7253,32 @@ Filer med upassende dykkedato/-tid</translation> <translation>Bilder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Hent bilde(r) fra fil(er)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Hent bilde(r) fra web</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>Sletter valgte bilder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>Slett alle bilder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>Sletter bilder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>Er du sikker på at du vil slette alle bilder?</translation> </message> @@ -7256,7 +7456,7 @@ fra luft og bruker: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>Ingen emneord</translation> </message> @@ -7660,24 +7860,24 @@ fra luft og bruker: <translation>Serveren svarte med denne informasjonen: </translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface sjekker hver andre uke om en ny versjon er tilgjengelig. Hvis du ikke vil dette, trykk Avslå.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Avslå</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>OK</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Sjekk etter oppdateringer automatisk</translation> </message> @@ -7938,8 +8138,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation>Ingen feil</translation> </message> @@ -8063,22 +8263,12 @@ Snitt</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation>Kunne ikke lese header</translation> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation>Tetthet: %.1fg/ℓ -</translation> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8410,8 +8600,8 @@ Snitt</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>oksygen</translation> </message> @@ -8496,15 +8686,10 @@ Snitt</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> - <source>(%s) or (%s)</source> - <translation>(%s) eller (%s)</translation> - </message> - <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>luft</translation> </message> @@ -8514,27 +8699,27 @@ Snitt</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>integrert bly</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>vektbelte</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>ankelvekt</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation>bakplate</translation> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8717,23 +8902,23 @@ Snitt</translation> <translation>Ferdig å synkroniserer med skylager</translation> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Klarte ikke å koble til skylager for Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation>git clone of %s failed (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation>Synkroniserer datafil</translation> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>ukjent</translation> @@ -8875,62 +9060,62 @@ Snitt</translation> <translation>Feil ved lesing av gassmiks</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Kunne ikke lage parser for %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Feil ved registrering av data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Feil ved lesing av detaljer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation>Ferdig å laste ned dykk på %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Hendelse: Venter på bruker</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation>model=%s firmware=%u serial=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Feil ved registrering av hendelseshåndterer.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Feil ved registrering av avbruddshåndterer.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Feil ved import av dykkedata</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Kunne ikke opprette kontekst for libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Fikk ikke åpnet %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -8939,13 +9124,13 @@ I de fleste tilfeller vil en logg fra libdivecomputer være nyttig for å feils Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation>Ingen dykk lastet ned fra dykkecomputer</translation> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>Flere GPS-posisjoner for dette steder; også %s @@ -8953,19 +9138,19 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation>ytterligere navn for sted: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation>Last inn dykk fra lokal cache</translation> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation>Åpnet dykkelogg</translation> </message> @@ -8981,19 +9166,19 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. <translation>Feil - %s - leser dykk %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation>Rar lesing av prosent %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation>Kunne ikke lese '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åpne stilark %s</translation> </message> @@ -9012,8 +9197,8 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation>Advarsel:</translation> </message> @@ -9039,16 +9224,6 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Kjøretid:%dmin<br></div></translation> @@ -9151,6 +9326,21 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. <translation>SAC</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9173,6 +9363,16 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. <translation>dykkeplan</b> laget på</translation> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekomodell: Bühlmann ZHL-16C med GF Low = %d%% og GF High = %d%%</translation> @@ -9218,22 +9418,17 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. <translation>påkrevet minimum gass ved oppstigning overstiger flasketrykk</translation> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s av <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s i planlagt oppstigning)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation>%.0f%s (%.0f%s under planlagt oppstigning) av <span style='color: red;'><b>%s</b></span></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <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="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>lav pO₂ verdi %.2f ved %d:%02u med gass %s ved dybde %.*f %s</translation> </message> @@ -9243,12 +9438,12 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. <translation>Finner ikke gassen %s</translation> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9257,84 +9452,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Sikkerhetsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9343,7 +9538,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9352,161 +9547,168 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1427"/> + <source>Density: %.1fg/ℓ +</source> + <translation>Tetthet: %.1fg/ℓ +</translation> + </message> + <message> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Sikkerhetsstopp: ukjent tid @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deko: ukjent tid @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation>I deko </translation> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation>I deko (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation>Kalkulert tak %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Vev %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation>puls: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation>retning: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation>snittdybde hit %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation>%s SAC: %.*f%s</translation> </message> @@ -10372,22 +10574,22 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>By</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation>Lagrer data</translation> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation>Lagrer dykk</translation> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation>Opprettet lokal cache</translation> </message> <message> - <location filename="../core/save-git.c" line="1237"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation>Forbereder lagring av data</translation> </message> @@ -10400,117 +10602,117 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation>Liste over dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation>Administrasjon av dyk</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation>Skru av lokasjonstjeneste</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation>Valg</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation>Legg til dykk manuelt</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation>Lastet ned fra DC</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> - <source>Apply GPS Fixes</source> - <translation>Legg til GPS-fiks</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>Manuell skysynkronisering</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation>Frakoblet modus</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation>Skru på automatisk skysynkronisering</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Ved å skru av automatisk skysynkronisering vil all data bli lagret lokalt. Dette kan være nyttig ved begrenset eller ingen nettverkstilgang. Velg "Manuell synk med skyen" hvis du har nettverkstilgang og ønsker å synke til skyen.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation>Hjelp</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation>Last opp GPS-data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation>Legg til GPS-fiks</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Last ned GPS-data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation>Vis GPS-posisjoner</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation>Slett GPS-cache</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation>Utvikler</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation>Applikasjonslogg</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation>Temainformasjon</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation>Om</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation>Kjør posisjonstjeneste</translation> </message> @@ -10613,51 +10815,56 @@ p, li { white-space: pre-wrap; } <translation>Planlegging</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation>VPM-B deko</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation>Bühlmann deko</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation>Reservegass</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation>Forsinke gassbytte hvis et stopp ikke er påkrevd</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation>Bytt bare ved påkrevede stopp</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation>Planlegg stopp med bakgass</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>min</translation> </message> @@ -10677,153 +10884,153 @@ p, li { white-space: pre-wrap; } <translation>Rekreasjonsmodus</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation>Dropp til første dybde</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> - <translation>Minimum tid for bytte</translation> - </message> - <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> <source>Safety stop</source> <translation>Sikkerhetsstopp</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> <source>Conservatism level</source> <translation>Konservatisme</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> + <translation>Dykkemodus</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation>Gassvalg</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation>Regn ut variasjoner i planen (kan gå treigt)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation>Vis variasjoner i planen</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation>SAC-faktor</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation>Brukt til utregning av minimum gass. Ta hensyn til to dykkere med mulig økt SAC etter OOG.</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation>Problemløsningstid</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation>Brukt for å regne ut mimimum gass. Ekstra tid ved maks dybde etter OOG.</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation>Brukes for å regne ut best miks. Velg best miks-dybde i 'Tilgjengelige gasser'-tabellen ved å legge inn gassdybde, deretter "B" (beste trimix-miks) eller "BN" (beste nitrox-miks)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>GF lav</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>GF høy</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>SAC på bunn</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation>pO₂ på bunn</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation>Best miks END</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Notater</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>I dykkeplanen, vis stoppenes løpetid (absolutt tid)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation>Vis løpetid</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>I dykkeplanen, vis stoppenes lengde (relativ tid)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation>Vis lengde på segment</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>I dykkeplanen, vis overganger eller behandle dem eksplisitt</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation>Vis overganger i deko</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation>Utdypende dykkeplan</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation>pO₂ for deko</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation>SAC under deko</translation> </message> diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts index e8777d79c..15350bad0 100644 --- a/translations/subsurface_nl_NL.ts +++ b/translations/subsurface_nl_NL.ts @@ -2329,12 +2329,12 @@ GPS locatie:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="373"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Maak een nieuwe duikstek, door relevante informatie van de huidige duikstek te kopiëren. </translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="374"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation>Nieuwe duikstek aanmaken onder deze naam</translation> </message> @@ -2579,76 +2579,76 @@ GPS locatie:</translation> <translation>Schrijf duik als TeX macro's naar bestand</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Exporteer UDDF bestand als</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> <source>UDDF files</source> <translation>UDDF bestanden</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> <source>CSV files</source> <translation>CSV bestanden</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> <source>HTML files</source> <translation>HTML bestanden</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> <source>Subsurface files</source> <translation>Subsurface bestanden</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>TeX files</source> <translation>TeX bestanden</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>Export CSV file as</source> <translation>Exporteer CSV bestand als</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export world map</source> <translation>Wereldkaart exporteren</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> <source>Export Subsurface XML</source> <translation>Exporteer Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Bewaar dieptes waarop de foto's genomen zijn</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Exporteer naar TeX bestand</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Exporteer HTML bestanden als</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Even geduld, bezig met exporteren...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Kan het bestand %s niet openen</translation> </message> @@ -2989,41 +2989,61 @@ GPS locatie:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="157"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>onbekend</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="192"/> - <location filename="../qt-models/diveplannermodel.cpp" line="277"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation>cyl.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Eind diepte</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Duur</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Gebruikt Gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="381"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation>Stop tijden</translation> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3609,7 +3629,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Downloaden</translation> </message> @@ -3635,7 +3655,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Annuleren</translation> </message> @@ -3665,37 +3685,37 @@ p, li { white-space: pre-wrap; } <translation>Verbinding:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Opnieuw</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Afsluiten</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>Geladen duiken</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation>Informatie:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Aanvaarden</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Alles selecteren</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Selectie ongedaan maken</translation> </message> @@ -3982,6 +4002,11 @@ p, li { white-space: pre-wrap; } <source>Country</source> <translation>Land</translation> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> + <translation>Bewerk locatie op kaart</translation> + </message> </context> <context> <name>LocationInformationModel</name> @@ -4005,29 +4030,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="253"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation>Beheer duikstekken</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="64"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> <translation>Duikstekken samenvoegen in huidige stek</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="73"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> <translation>Duikstekken worden samengevoegd</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="74"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation>U staat op het punt duikstekken samen te voegen, dit kan niet ongedaan gemaakt worden. Bent u zeker?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="260"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation>U bent een duikstek aan het bewerken</translation> </message> @@ -4045,8 +4070,8 @@ Bent u zeker?</translation> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>Notities</translation> </message> @@ -4067,19 +4092,19 @@ Bent u zeker?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>Lucht temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>Water temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>Locatie</translation> </message> @@ -4144,123 +4169,123 @@ Bent u zeker?</translation> <translation>Duur</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation>Extra Informatie</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>Informatie</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation>Statistieken</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>Foto's</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation>Wijzigingen toepassen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation>Wijzigingen verwijderen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>Flessen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation>Fles toevoegen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>Gewichten</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation>Voeg gewichtssysteem toe</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation>Open Circuit</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation>Apneu</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>Lucht temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>Water temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>Deze trip wordt bewerkt.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>Meerdere duiken worden bewerkt.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>Deze duik wordt bewerkt.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>Trip notities</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>Trip locatie</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation>Nieuwe duikstek</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>Wijzigingen niet opslaan?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation>U staat op het punt wijzigingen te verwijderen</translation> </message> @@ -4273,420 +4298,420 @@ Bent u zeker?</translation> <translation>Bestand</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>&Logboek</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>Toon</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>&Help</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>&Importeren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation>Bewerken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> <translation>Deel via</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>&Nieuw logboek</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>Nieuw</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>Logboek &openen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="560"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>Open</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>Bewaar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>Opslaan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>Bewaren als</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>Opslaan als...</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>Sluiten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>Sluiten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>Afdrukken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>Voorkeuren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>Afsluiten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>Importeren uit &duikcomputer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>GPS gegevens importeren van Subsurface webservice</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> <translation>Namen duikcomputers wijzigen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>Duik toevoegen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation>Duik bewerken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation>Kopieer duikcomponenten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation>Plak duikcomponenten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>Hernummeren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>Automatisch groeperen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>Jaarlijkse statistieken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>Duiklijst</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>Profiel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>Info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>Alle</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation>Vorige duikcomputer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation>Volgende duikcomputer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>Over Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation>Handleiding</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> <translation>&Kaart</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>Duik plannen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>Importeer logbestanden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>Importeer logboeken uit andere programma's</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>Importeren van divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>Volledig scherm</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>Volledig scherm in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation>Zoek naar updates</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>Exporteren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation>Exporteer logboek</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation>Duikcomputer configureren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation>Duik bewerken in de planner</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation>Toon/verberg pO₂ grafiek</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation>Toon/verberg pN₂ grafiek</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>pHe grafiek in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation>Door DC aangegeven plafond in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation>Berekend plafond in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation>Berekening van alle compartimenten in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Berekend plafond in 3m stappen in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>Toon/verberg hartslag</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>MOD in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation>NDL, TTS in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation>SAC in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation>Meetlat in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation>Grafiek schalen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation>Toon/verberg foto's</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> - <translation>Toon fles balk</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> + <translation>Toon Gas Bar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation>Duiklijst filteren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation>Heat-map tonen/verbergen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation>Gebruikersenquête</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>Ongedaan maken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>Opnieuw</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation>Vind verplaatste a&fbeeldingen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation>Open c&loud opslag</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation>Bewaar in clo&ud opslag</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation>&Manage duikstekken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation>B&ewerk duikstek</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation>Maak cloud storage online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="370"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Verbind met</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="400"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Verbreek verbinding met</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="596"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1678"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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="../desktop-widgets/mainwindow.cpp" line="557"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>Bestand openen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Annuleren</translation> </message> @@ -4696,28 +4721,28 @@ Bent u zeker?</translation> <translation>Bewaar geen lege duiklog in de cloud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="669"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Doorloop mappen met afbeeldingen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>Scan afbeeldingen...(even geduld aub)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Waarschuwing</translation> </message> @@ -4727,12 +4752,12 @@ Bent u zeker?</translation> <translation>Je probeert duiken samen te voegen met een %1min oppervlakteinterval</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> <source>Template backup created</source> <translation>Template backup aangemaakt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>The following backup printing templates were created: %1 @@ -4755,202 +4780,202 @@ alleen leesbaar zijn, en deze dienen niet gewerkt te worden, want de applicatie kan deze overschrijven bij opnieuw opstarten.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="731"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="857"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="909"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Runtime tabel afdrukken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>U probeert een duik te herplannen die geen geplande duik is.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>U probeert een duik aan te passen die niet handmatig is toegevoegd.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1108"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Jaarlijkse statistieken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1287"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> <source>Dive log files</source> <translation>Duiklog bestanden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> <source>Subsurface files</source> <translation>Subsurface bestanden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> <source>MkVI files</source> <translation>MkVI bestanden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> <source>All files</source> <translation>Alle bestanden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <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="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Aanpassingen opslaan?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <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="../desktop-widgets/mainwindow.cpp" line="1705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Bestand bewaren als</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1793"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[locale cache voor] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[cloud opslag voor] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1902"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>Opent een databestand van een oudere versie</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1903"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>U heeft een databestand van een oudere versie van Subsurface geopend. Wij raden u aan de handleiding te lezen met betrekking tot de nieuwe versie, in het bijzonder de sterk veranderde duikstek-afhandeling. Subsurface heeft reeds gesprobeerd de data te converteren, maar het is nuttig zelf vast te stellen dat de conversie correct is verlopen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1914"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Open duiklogboek</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>Contact opnemen met cloud service...</translation> </message> @@ -4958,7 +4983,7 @@ Subsurface heeft reeds gesprobeerd de data te converteren, maar het is nuttig ze <context> <name>MapWidget</name> <message> - <location filename="../map-widget/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation>Versleep de geselecteerde duiklocatie</translation> </message> @@ -5067,89 +5092,89 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Open circuit</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Laatste stop op 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% gem. diepte tot 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20ft tot oppervlakte</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Laatste stop op 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% gem. diepte tot 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6m tot oppervlakte</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -5966,7 +5991,7 @@ Zie http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <source>The template '%1' is read-only and connot be edited. + <source>The template '%1' is read-only and cannot be edited. Please export this template to a different file.</source> <translation>Sjabloon '%1' is alleen leesbaar en kan niet worden bewerkt. Exporteer naar een ander bestand.</translation> @@ -6012,17 +6037,17 @@ Exporteer naar een ander bestand.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (#%1 van %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Onbekende duikcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>NDL / TTS wordt niet getoond omdat de berekening te lang duurt</translation> </message> @@ -6037,12 +6062,12 @@ Exporteer naar een ander bestand.</translation> <translation>Maak eerste duikcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation>Geplande duik</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation>Handmatig toegevoegde duik</translation> </message> @@ -6136,148 +6161,148 @@ Exporteer naar een ander bestand.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation>Starten...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation>Open lokale duikgegevens</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation>Open lokale duikgegevens mislukt</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 duiken geladen uit de lokale duikgegevens</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation>werkt met lokale data</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation>Fout bij het verwerken van de lokale opslag, opgegeven</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation>Geen cloud rechten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation>Voer geldige cloud rechten in</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Het cloud wachtwoord kan alleen letters, nummers en de volgende symbolen bevatten: '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> <translation>Ongeldig formaat voor e-mailadres</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Probeert cloud opslag te openen met nieuwe rechten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation>Cloud rechten worden gecontroleerd</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation>Geen antwoord van de cloud server bij het valideren van de inlogrechten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> <translation>Onjuiste cloud rechten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Kan niet verbinden met de Subsurface cloud opslag - cloud account niet geverifieerd</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation>Cloud rechten zijn ongeldig</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Kan cloud opslag niet openen: Fout bij aanmaken https verbinding</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation>Kan cloud opslag niet openen: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation>Kan niet verbinden met de Subsurface cloud opslag</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation>Cloud rechten zijn geldig. duiken ophalen...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation>Cloud opslag fout: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Duiken laden uit de lokale opslag ('no cloud' mode)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation> Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Cloud opslag succesvol geopend. Geen duiken in de duiklijst.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> <translation>Onbekende GPS locatie</translation> </message> @@ -7243,32 +7268,32 @@ Bestanden met onjuiste datum/tijd</translation> <translation>Foto's</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Laad foto('s) van bestand(en)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Laad foto('s) van het web</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>Verwijder geselecteerde afbeeldingen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>Verwijder alle afbeeldingen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>Afbeeldingen worden verwijderd</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>Weet je zeker dat je alle afbeeldingen wilt verwijderen?</translation> </message> @@ -7850,24 +7875,24 @@ worden uit lucht en: <translation>De server gaf het volgende antwoord:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface controleert iedere 2 weken of er een nieuwe versie beschikbaar is. Als je dit niet wilt, selecteer Weiger.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Weigeren</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Aanvaarden</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Automatisch controleren of er updates zijn</translation> </message> @@ -8591,8 +8616,8 @@ Maximum</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1144"/> - <location filename="../core/planner.c" line="1147"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>zuurstof</translation> </message> @@ -8677,15 +8702,10 @@ Maximum</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1879"/> - <source>(%s) or (%s)</source> - <translation>(%s) of (%s)</translation> - </message> - <message> <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1140"/> - <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>lucht</translation> </message> @@ -8695,27 +8715,27 @@ Maximum</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>Geïntegreerd</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>riem</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>enkel</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation>backplate</translation> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8913,8 +8933,8 @@ Maximum</translation> <translation>Data bestand synchroniseren</translation> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3481"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>onbekend</translation> @@ -9126,7 +9146,7 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1280"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>meedere GPS locaties voor deze duikstek; ook %s @@ -9134,19 +9154,19 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1342"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation>extra naam voor duikstek: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation>Duiken laden uit lokale cache</translation> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation>Duik data openen gelukt</translation> </message> @@ -9162,19 +9182,19 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve <translation>Fout - %s - verwerking duik %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation>Vreemde percentage %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2104"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation>Fout bij analyse van '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="4003"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation>Kan de stylesheet %s niet openen</translation> </message> @@ -9220,11 +9240,6 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation>Runtime: %dmin %s</translation> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime: %dmin<br></div></translation> @@ -9369,6 +9384,11 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve <translation>duikplan</b> (overlappende duiken vastgesteld)</translation> </message> <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation>Runtime: %dmin%s</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Deco model: Bühlmann ZHL-16C met GFLow = %d%% en GFHigh = %d%%</translation> @@ -9434,12 +9454,12 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve <translation>Gas %s kan niet gevonden worden</translation> </message> <message> - <location filename="../core/planner.c" line="1148"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>EAN</translation> </message> <message> - <location filename="../core/profile.c" line="1373"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9448,84 +9468,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1385"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1391"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1396"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1400"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1402"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1405"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1445"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Veiligheidsstop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1381"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1414"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9534,7 +9554,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9543,168 +9563,168 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1425"/> + <location filename="../core/profile.c" line="1427"/> <source>Density: %.1fg/ℓ </source> <translation>Dichtheid: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Veiligheidsstop: onbekende tijd @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1448"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deco: onbekende tijd @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1452"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../core/profile.c" line="1454"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1457"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1460"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (berekend) </translation> </message> <message> - <location filename="../core/profile.c" line="1468"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation>In deco (berekend) </translation> </message> <message> - <location filename="../core/profile.c" line="1471"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (berekend) </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (berekend) </translation> </message> <message> - <location filename="../core/profile.c" line="1477"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (berekend) </translation> </message> <message> - <location filename="../core/profile.c" line="1479"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (berekend) </translation> </message> <message> - <location filename="../core/profile.c" line="1482"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1485"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation>Berekend plafond %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1491"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Compartiment %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1497"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation>hartslag: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1499"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation>koers: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1502"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation>gemiddelde diepte tot nu toe %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1599"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1603"/> - <location filename="../core/profile.c" line="1607"/> - <location filename="../core/profile.c" line="1611"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1615"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1619"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1623"/> - <location filename="../core/profile.c" line="1627"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1659"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation>%s SAC: %.*f%s</translation> </message> @@ -10569,22 +10589,22 @@ Is de Uemis Zurich correct aangesloten?</translation> <translation>Stad</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation>Opslaan data gestart</translation> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation>Opslaan duiken gestart</translation> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation>Lokale cache aangemaakt</translation> </message> <message> - <location filename="../core/save-git.c" line="1237"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation>Voorbereiden data opslag</translation> </message> @@ -10632,11 +10652,6 @@ Is de Uemis Zurich correct aangesloten?</translation> <translation>Download uit DC</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="156"/> - <source>Apply GPS Fixes</source> - <translation>Pas GPS Fixes toe</translation> - </message> - <message> <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>Handmatig synchroniseren met cloud</translation> @@ -10672,6 +10687,11 @@ Is de Uemis Zurich correct aangesloten?</translation> <translation>Upload GPS data</translation> </message> <message> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation>Pas GPS fixes toe</translation> + </message> + <message> <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>GPS data downloaden</translation> diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts index a75f541a2..76a464362 100644 --- a/translations/subsurface_pl_PL.ts +++ b/translations/subsurface_pl_PL.ts @@ -43,66 +43,86 @@ <translation>Wybór zdalnego urządzenia Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Wykryte urządzenia</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Zapisz</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Wyjście</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Skanuj</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Wyczyść</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Szczegóły lokalnego urządzenia Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Nazwa:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Adres:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth włączony</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Włącz/Wyłącz</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Wybierz urządzenie</translation> @@ -113,22 +133,22 @@ <translation>Nazwa:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation>NIe udało się zinicjalizować Winsock wersja 2.2</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation>Próbuję włączyć lokalne urzadzenie Bluetooth...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation>Próbuję wyłączyć lokalne urządzenie Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation>Wyczyszczono listę zdalnych urzadzeń.</translation> </message> @@ -160,22 +180,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation>UNPAIRED</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation>PAIRED</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTHORIZED_PAIRED</translation> </message> @@ -185,113 +205,113 @@ <translation>%1 (%2) [Stan: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Urządzenie %1 może zostać użyte. Możesz wcisnąć przycisk Zapisz.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Urządzenie %1 musi zostać sparowane przed użyciem. Użyj menu kontekstowego. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation>Lokalne urządzenie zostało zmienione.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation>Połącz</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation>Rozłącz</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation>Próbuję sparować urządzenie %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation>Próbuję rozłączyć urządzenie %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation>Urządzenie %1 zostało odłączone.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation>Urządzenie %1 zostało sparowane.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation>Urządzenie %1 zostało sparowane i zautoryzowane.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Urządzenie %1 może zostać użyte do połączenia. Możesz wcisnać przycisk Zapisz.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation>Błąd lokalnego urządzenia: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Błąd parowania. Jeśli urządzenie wymaga podania kodu PIN spróbuj je sparować przy pomocy systemu operacyjnego.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation>Nieznany błąd.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Adapter Bluetooth jest wyłączony, włącz go przed rozpoczęciem wykrywania urządzeń.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Zapis lub odczyt z urządzenia zakończył się błędem.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation>Natrafiono na nieznany błąd.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation>Błąd wykrywania urządzeń: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>Niedostępne</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Nie można użyć lokalnego adaptera Bluetooth.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Agent wykrywania urządzeń nie został utworzony, bo adres %1 nie odpowiada fizycznemu adresowi żadnego lokalnego urządzania Bluetooth. </translation> </message> @@ -312,7 +332,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>brak partnerów</translation> </message> @@ -1632,84 +1652,84 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Tworzy kopię ustawień komputera nurkowego</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> - <translation>Pliki kopii zapasowych (*.xml)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>Błąd kopii zapasowej XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>Wystąpił błąd podczas zapisywania pliku kopii zapasowej. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Pomyślnie utworzono kopię zapasową.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>Twoje ustawienia zostały zapisane do: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Przywraca ustawienia komputera nurkowego</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>Błąd przywracania XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Wystąpił błąd podczas przywracania z pliku kopii zapasowej. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>Pomyślnie przywrócono ustawienia</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>Twoje ustawienia zostały pomyślnie przywrócone.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Wybierz plik z aktualizacją</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> - <translation>Wszystkie pliki (*.*)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> - <translation>Pliki logów (*.log)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1789,27 +1809,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>Kliknięcie tu usunie butlę z listy.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Ten gaz jest używany. Można usuwać tylko gazy, których nie używasz.</translation> </message> @@ -1923,27 +1943,27 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Usuń nurkowanie</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -1951,103 +1971,103 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Data:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Miejsce:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Głębokość:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Długość:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Temp. powietrza:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Temp. wody:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Skafander:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Partner:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Waga:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Ocena:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Notatki:</translation> </message> @@ -2123,23 +2143,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>Ręczna zmiana na OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation> początek</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation> koniec</translation> @@ -2304,12 +2324,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Utwórz nowe miejsce nurkowe, skopiuj istotne informacje z bieżącego nurkowania.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation>Utwórz nowe miejsce nurkowe z tą nazwą</translation> </message> @@ -2554,76 +2574,76 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Eksportuj plik UDDF jako</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>Pliki UDDF (*.uddf *.UDDF)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <source>UDDF files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> - <translation>Eksportuj plik CSV jako</translation> + <source>CSV files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>pliki CSV (*.csv *.CSV)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <source>HTML files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> - <translation>Eksport mapy świata</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>Pliki HTML (*.html)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>TeX files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> - <translation>Eksport Subsurface XML</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <source>Export CSV file as</source> + <translation>Eksportuj plik CSV jako</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <source>Export world map</source> + <translation>Eksport mapy świata</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>Pliki XML (*.xml *.ssrf)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <source>Export Subsurface XML</source> + <translation>Eksport Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Zapisz głębokości zdjeć</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Eksportuj pliki HTML jako</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Poczekaj proszę, trwa eksportowanie..</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Nie można otworzyć pliku %s</translation> </message> @@ -2918,7 +2938,7 @@ GPS location:</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -2964,41 +2984,61 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>nieznana</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Głębokość końcowa</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Czas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Czas trwania</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Używany gaz</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3031,107 +3071,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Głębokość</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Czas</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Ciśnienie</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Kolor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Podane przez użytkownika</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Ciśnienie S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Ciśnienie I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Sufit</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Czujnik 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Czujnik 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Czujnik 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Cisnienie otoczenia</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>Tętno</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>Gradient factor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>Głębokość średnia @ s</translation> </message> @@ -3451,71 +3491,71 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Pobierz</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation>Wybierz tryb pobierania Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Błąd</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Wykryj komputer Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> - <translation>Pliki logów (*.log)</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Ostrzeżenie</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Użycie libdivecomputer w trybie diagnostycznym spowoduje, że pobrane nurkowania NIE ZOSTANĄ dodane do listy nurkowań.</translation> </message> - <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> - <translation>Pliki binarne (*.bin)</translation> - </message> </context> <context> <name>DownloadFromDiveComputer</name> @@ -3584,7 +3624,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Pobierz</translation> </message> @@ -3610,7 +3650,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Anuluj</translation> </message> @@ -3640,37 +3680,37 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Ponów</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Wyjście</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Zatwierdź</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Wybierz wszystko</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3701,12 +3741,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Zaloguj się, aby połączyć się z Facebookiem. Pozwoli to Subsurface publikować nurkowania na Twojej osi czasu.</translation> </message> @@ -3900,7 +3940,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation>nie podano miejsca</translation> </message> @@ -3957,6 +3997,11 @@ p, li { white-space: pre-wrap; } <source>Country</source> <translation>Kraj</translation> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> + <translation type="unfinished"/> + </message> </context> <context> <name>LocationInformationModel</name> @@ -3980,29 +4025,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation>Zarządzanie miejscami nurkowymi</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> <translation>Połącz z bieżącym miejscem</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> <translation>Łączenie miejsc nurkowych</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation>Masz zamiar połączyć miejsca nurkowe w jedno, tego nie da się cofnąć. Czy na pewno kontynuować?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation>Edytujesz miejsce nurkowania</translation> </message> @@ -4020,8 +4065,8 @@ Czy na pewno kontynuować?</translation> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>Opis</translation> </message> @@ -4042,19 +4087,19 @@ Czy na pewno kontynuować?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>Temp. powietrza</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>Temp. wody</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>Miejsce</translation> </message> @@ -4119,123 +4164,123 @@ Czy na pewno kontynuować?</translation> <translation>Czas</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>Informacje</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation>Statystyka</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>Zdjęcia</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation>Zastosuj zmiany</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation>Porzuć zmiany</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>Butle</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation>Dodaj butlę</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>Balast</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation>Dodaj balast</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation>OC</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>Temp. powietrza [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>Temp. wody [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>Ta grupa nurkowań jest obecnie edytowana.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>Kilka nurkowań jest obecnie edytowanych.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>To nurkowanie jest obecnie edytowane.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>Opis nurkowań</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>Miejsce nurkowań</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation>Nowe miejsce nurkowe</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>Porzucić zmiany?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation>Masz zamiar porzucić zmiany.</translation> </message> @@ -4248,451 +4293,451 @@ Czy na pewno kontynuować?</translation> <translation>Plik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>Log</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>Widok</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>Pomoc</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>Import</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation>Edytuj</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> <translation>Publikuj na</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>Nowy logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>Nowy</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>Otwórz logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>Otwórz</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>Zapisz</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>Zapisz</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>Zapisz jako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>Zapisz jako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>Zamknij</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>Zamknij</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>Drukuj</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>Ustawienia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>Wyjdź</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>Importuj z komputera nurkowego</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importuj dane GPS z usługi sieciowej Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> <translation>Edycja nazw komputerów nurkowych</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>Dodaj nurkowanie</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation>Edytuj nurkowanie</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation>Kopiuj parametry nurkowania</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation>Wklej parametry nurkowania</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>Zmień numerację</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>Automatycznie grupuj</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>Statystyka roczna</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>Lista nurkowań</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>Info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>Wszystko</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation>Poprzedni komputer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation>Następny komputer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>O Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation>Instrukcja obsługi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>Zaplanuj nurkowanie</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>Importowanie logów nurkowych</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>Importuj logi z innej aplikacji</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>Importuj z divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>Pełen ekran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>Przełącz pełen ekran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation>Sprawdź aktualizacje</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>Eksport</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation>Eksport nurkowań</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation>Konfiguruj komputer nurkowy</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation>Edytuj w planerze</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation>Pokazuj wykres pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation>Pokazuj wykres pN₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>Pokazuj wykres pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation>Pokazuj sufit z komputera nurkowego</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation>Pokazuj obliczony sufit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation>Obliczenia dla wszystkich tkanek</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Pokazuj obliczony sufit z krokiem 3m</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>Pokazuj tętno</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>Pokazuj MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>Pokazuj EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation>Pokazuj NDL / TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation>Pokazuj SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation>Pokazuj linijkę</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation>Skalowanie wykresu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation>Pokazuj zdjęcia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> - <translation>Pokazuj pasek gazu</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation>Filtrowanie nurkowań</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation>Ankieta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>Cofnij</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>Ponów</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation>Znajdź przeniesione zdjecia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation>Otwórz dane z chmury</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation>Zapisz do chmury</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation>Zarządzaj miejscami nurkowymi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation>Edycja miejsc nurkowych</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>Otwórz plik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Anuluj</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Katalogi zdjęć do przejrzenia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Skanuj</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>Skanowanie zdjeć... (to chwilę potrwa)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Ostrzeżenie</translation> </message> @@ -4702,105 +4747,221 @@ Czy na pewno kontynuować?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Drukowanie planu nurkowego</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Próba zmiany planu nurkowania, które nie zostało utworzone przez planer.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Próba edycji nurkowania, które nie zostało dodane ręcznie.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Statystyka roczna</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>CSV</source> + <translation>CSV</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <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="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Zapisać zmiany?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <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="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Zapisz plik jako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Pliki Subsurface XML (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[zapis w chmurze dla] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>Otwarto plik ze starszej wersji</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Otworzony plik pochodzi ze starszej wersji Subsurface. Zalecamy zapoznać się z instrukcją i opisanymi tam zmianami w najnowszej wersji programu, szczególnie z nowym sposobem zarządzania miejscami nurkowymi. Subsurface zaimportował informacje o miejscach nurkowych, ale może warto poświęcić chwilę na przejrzenia tych danych i upewnienie się, że wszytko wygląda poprawnie.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Otwórz plik z logiem</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>Łączenie się z chmurą...</translation> </message> @@ -4808,7 +4969,7 @@ Subsurface zaimportował informacje o miejscach nurkowych, ale może warto pośw <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4816,22 +4977,22 @@ Subsurface zaimportował informacje o miejscach nurkowych, ale może warto pośw <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4839,7 +5000,7 @@ Subsurface zaimportował informacje o miejscach nurkowych, ale może warto pośw <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4889,7 +5050,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> + <source>Firmware files</source> <translation type="unfinished"/> </message> </context> @@ -4914,89 +5075,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Obieg otwarty</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Ostatni przystanek na gł. 20 stóp</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% śr. głębokości do 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20ft do powierzchni</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Ostatni przystanek na 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% śr. głębokości do 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6m do powierzchni</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -5110,8 +5271,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Pliki Subsurface XML (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5325,33 +5486,33 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Format daty</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation>Tryb zegara</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation type="unfinished"/> </message> @@ -5361,27 +5522,37 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Język</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation>Wymagane ponowne uruchomienie</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Aby użyć nowego języka musisz ponownie uruchomić Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> <translation type="unfinished"/> </message> </context> @@ -5792,45 +5963,70 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and cannot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>Importuj plik szablonu</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> - <translation>Pliki HTML (*.html)</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>Eksportuj szablon jako</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation>Tego nie da się cofnąć!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>Usunąć szablon: %1?</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation type="unfinished"/> </message> </context> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (#%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Nieznany komputer nurkowy</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Pokazywanie NDL / TTS zostało wyłączone z powodu zbyt długiego czasu obliczeń.</translation> </message> @@ -5840,22 +6036,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Dodaj zmianę gazu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation> (Butla %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> @@ -5865,6 +6056,11 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> @@ -5897,8 +6093,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> - <translation>Zmień ciśnienie w butli %1 (obecnie interpolowane jako %2)</translation> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> @@ -5944,147 +6140,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Adres email i hasło do przechowywania danych w chmurze może zawierać jedynie litery, cyfry oraz znaki '.', '-', '_', '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6182,7 +6378,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6190,7 +6386,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation type="unfinished"/> </message> @@ -6198,7 +6394,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation type="unfinished"/> </message> @@ -6525,7 +6721,7 @@ Nie wszystkie zdjęcia mają czas w zakresie pomiędzy </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> + <source>Image files</source> <translation type="unfinished"/> </message> <message> @@ -6639,7 +6835,7 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> + <source>Import messages (errors, warnings, etc)</source> <translation type="unfinished"/> </message> <message> @@ -6649,81 +6845,87 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> + <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> <translation type="unfinished"/> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation>Średnia</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation>Data nurkowania: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation>Czas: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation>Miejsce nurkowania: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation>Partner: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation> @@ -6918,7 +7120,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation>nie podano skafandra</translation> </message> @@ -7044,32 +7246,32 @@ Files with inappropriate date/time</source> <translation>Zdjęcia</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Dodaj zdjęcia z dysku</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Dodaj zdjęcia z Internetu</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation type="unfinished"/> </message> @@ -7248,7 +7450,7 @@ z powietrza przy użyciu: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>brak tagów</translation> </message> @@ -7652,23 +7854,23 @@ z powietrza przy użyciu: <translation>Serwer zwrócił następującą informację:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Przestań</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Zatwierdź</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Automatyczne sprawdzanie aktualizacji </translation> </message> @@ -7930,8 +8132,8 @@ Język: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation>Bez błędu</translation> </message> @@ -8050,21 +8252,12 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation>Błąd podczas przetwarzania nagłówka</translation> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8395,8 +8588,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>tlen</translation> </message> @@ -8481,15 +8674,10 @@ Maximum</source> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> - <source>(%s) or (%s)</source> - <translation>(%s) lub (%s)</translation> - </message> - <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>powietrze</translation> </message> @@ -8499,27 +8687,27 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>zintegrowany</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>pas balastowy</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>na kostkach</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>doczepiany</translation> </message> @@ -8702,23 +8890,23 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Nie udało się połączyć z chmurą Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation>Nieudana operacja git clone dla %s (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>nieznana</translation> @@ -8860,75 +9048,75 @@ Maximum</source> <translation>Błąd podczas przetwarzania danych o użytym rodzaju gazu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Nie udało się utworzyć parsera dla %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Błąd podczas przetwarzania danych</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Błąd podczas przetwarzania próbek</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Oczekiwanie na działanie użytkownika</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Błąd rejestracji uchwytu (event handler)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Błąd rejestracji uchwytu (cancellation handler)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Błąd podczas importowania danych</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Nie można utworzyć kontekstu libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Nie udało się otworzyć %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>jest kilka lokalizacji GPS dla tego miejsca; także %s @@ -8936,19 +9124,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation>dodatkowa nazwa dla miejsca: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -8964,19 +9152,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Błąd - %s - przetwarzanie nurkowania %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation>Podejrzany skład procentowy %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation>Nie udało się przetworzyć '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation>Nie można otworzyć arkusza stylów %s</translation> </message> @@ -8995,8 +9183,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation>Ostrzeżenie:</translation> </message> @@ -9022,16 +9210,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation type="unfinished"/> @@ -9134,6 +9312,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>SAC</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9156,6 +9349,16 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> @@ -9201,22 +9404,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <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="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>niska wartość pO₂ %.2f o %d:%02u gaz %s na głębokości %.*f %s</translation> </message> @@ -9226,12 +9424,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Nie można znaleźć gazu %s</translation> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9240,108 +9438,114 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1427"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation>dekompresja @@ -9349,139 +9553,139 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (obliczone) </translation> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation>dekompresja (obliczone) </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h </translation> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation>Obliczony sufit: %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Tkanka %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation>kurs: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation>gł. średnia do teraz %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation>%s %sGł:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation>%s %sGł:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation type="unfinished"/> </message> @@ -10346,22 +10550,22 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation> <translation>Miasto</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1237"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> @@ -10374,117 +10578,117 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation>Ustawienia</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation>Pomoc</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation type="unfinished"/> </message> @@ -10587,51 +10791,56 @@ p, li { white-space: pre-wrap; } <translation>Planowanie</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation>algorytm VPM-B</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation>algorytm Bühlmann</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation>Rezerwa</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation>Opóźnij zmianę gazu jeśli przystanek nie jest wymagany</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation>Zmiana gazu tylko na przystankach</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation>Przerwy powietrzne</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>min</translation> </message> @@ -10651,153 +10860,153 @@ p, li { white-space: pre-wrap; } <translation>Tryb rekreacyjny</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation>Spadnij do pierwszej głębokości</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> - <translation>Min. czas na zmianę gazu</translation> - </message> - <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> <source>Safety stop</source> <translation>Przystanek bezpieczeństwa</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> <source>Conservatism level</source> <translation>Poziom konserwatyzmu</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> <source>+</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> + <translation>Rodzaj</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation>Ustawienia gazu</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>SAC przy dnie</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation>pO₂ przy dnie</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Notatki</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>Pokazuj runtime, czyli całkowity czas dla przystanku</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation>Pokazuj runtime</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>Pokazuj czas trwania (względny czas) przystanku</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation>Pokazuj czas trwania segmentu</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>Pokazuj lub ukrywaj listę przejść </translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation>Pokazuj przejścia między przystankami</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation>Plan opisowy</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation>pO₂ podczas deco</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation>Deco SAC</translation> </message> diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts index 496a34561..a798b6969 100644 --- a/translations/subsurface_pt_BR.ts +++ b/translations/subsurface_pt_BR.ts @@ -47,66 +47,86 @@ <translation>Seleção de dispositivo Bluetooth remoto</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Dispositivos encontrados</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Salvar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Encerrar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Buscar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Limpar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Detalhes do dispositivo Bluetooth local</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Nome:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Endereço:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth ligado</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Ligar/desligar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Selecione o dispositivo:</translation> @@ -117,22 +137,22 @@ <translation>Nome:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation>Não foi possível inicializar o Winsock 2.2</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation>Tentando ligar o dispositivo Bluetooth local...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation>Tentando desligar o dispositivo Bluetooth local...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation>A lista de dispositivos remotos foi apagada.</translation> </message> @@ -164,22 +184,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation>NÃO PAREADO</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation>PAREADO</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation>PAREAMENTO_AUTORIZADO</translation> </message> @@ -189,113 +209,113 @@ <translation>%1 (%2) [Estado: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>O dispositivo %1 pode ser usado para conexão. Você pode apertar o botão Salvar.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>O dispositivo %1 precisa ser pareado para poder ser usado. Por favor use o menu auxiliar para acessar as opções de pareamento.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation>O dispositivo local foi trocado.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation>Parear</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation>Desparear</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation>Tentando parear com o dispositivo %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation>Tentando desparear com o dispositivo %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation>Dispositivo %1 despareado.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation>Dispositivo %1 pareado.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation>Dispositivo %1 pareado e autorizado.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>O dispositivo %1 já pode ser usado para conexões. Você pode apertar o botão Salvar.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation>Erro do dispositivo local: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Erro de pareamento. Se o dispositivo remoto exige um PIN personalizado, tente fazer o pareamento através de seu sistema operacional.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation>Erro desconhecido.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>O adaptador Bluetooth está desligado. Ligue-o antes de fazer a busca.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Escrevendo ou lendo do dispositivo produziu um erro.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation>Ocorreu um erro desconhecido.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation>Erro na busca de dispositivo: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>Não disponível</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>O adaptador Bluetooth local não pode ser acessado.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>O agente de busca de dispositivos não foi criado porque o endereço %1 não corresponde ao endereço físico do dispositivo de nenhum dispositivo Bluetooth.</translation> </message> @@ -316,7 +336,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>Sem dupla</translation> </message> @@ -1636,84 +1656,84 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Fazer backup das configurações do computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> - <translation>Arquivos de backup (*.xml)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>Erro no XML de backup</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>Um erro ocorreu durante a escrita do arquivo de backup. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Backup bem sucedido</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>Suas configurações foram gravadas em: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Restaurar configurações do computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>Erro ao restaurar XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Ocorreu um erro durante o restauro do arquivo de backup. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>Restauro bem sucedido</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>Suas configurações foram restauradas com sucesso.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Escolha o arquivo de firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> - <translation>Todos arquivos (*.*)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> - <translation>Arquivos de log (*.log)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1793,27 +1813,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>Ao clicar aqui irá eliminar este cilindro.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Profundidade de troca do gás de deco. Calculada usando a preferência de pO₂ de deco, a não ser que tenha sido determinada manualmente.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Esse gás está em uso, Apenas cilindros que não estão sendo usados podem ser removidos.</translation> </message> @@ -1927,27 +1947,27 @@ o computador de mergulho selecionado?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation>Detalhes do mergulho</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Remover mergulho</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation>Mostrar no mapa</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation>Vários duplas</translation> </message> @@ -1955,104 +1975,104 @@ o computador de mergulho selecionado?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation>Mergulho %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Data:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Localidade:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation>Coordenadas:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation>Use atual Localização GPS:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Profundidade:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Duração:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Temperatura do ar:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Temperatura da água:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Roupa:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Companheiro:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Peso:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation>Cilindro:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation>Mistura gasosa:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation>Pressão inicial:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation>Pressão final:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Classificação:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Notas:</translation> </message> @@ -2128,23 +2148,23 @@ Localização GPS:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation>(cil. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>Troca manual para OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation>início</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation>fim</translation> @@ -2309,12 +2329,12 @@ Localização GPS:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -2559,76 +2579,76 @@ Localização GPS:</translation> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Exportar arquivo UDDF como</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>Arquivos UDDF (*.uddf *.UDDF)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <source>UDDF files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> - <translation>Exportar arquivo CSV como</translation> + <source>CSV files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>Arquivos CSV (*.csv *.CSV)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <source>HTML files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> - <translation>Exportar mapa do mundo</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>Arquivos HTML (*.html)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>TeX files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> - <translation>Exportar XML do Subsurface</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <source>Export CSV file as</source> + <translation>Exportar arquivo CSV como</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <source>Export world map</source> + <translation>Exportar mapa do mundo</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>Arquivos XML (*.xml *.ssrf)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <source>Export Subsurface XML</source> + <translation>Exportar XML do Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Exportar arquivo HTML como</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Não é possivel abrir o arquivo %s</translation> </message> @@ -2923,7 +2943,7 @@ Localização GPS:</translation> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation>Vários duplas</translation> </message> @@ -2969,41 +2989,61 @@ Localização GPS:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Profundidade final</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Tempo</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Gás usado</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>pé(s)</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3036,107 +3076,107 @@ Localização GPS:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Horário</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Pressão</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Cor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Entrado pelo usuário</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Pressão S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Pressão I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Teto</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation type="unfinished"/> </message> @@ -3451,71 +3491,71 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Receber</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Encontrar computador de mergulho Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> - <translation>Arquivos de log (*.log)</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Ao salvar a saída da biblioteca libdivecomputer as informações dos mergulhos recebidos NÃO serão gravadas na lista de mergulhos.</translation> </message> - <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> - <translation>Arquivos de saída (*.bin)</translation> - </message> </context> <context> <name>DownloadFromDiveComputer</name> @@ -3584,7 +3624,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Receber</translation> </message> @@ -3610,7 +3650,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -3640,37 +3680,37 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Tentar novamente</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Encerrar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Aceitar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Selecionar tudo</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3701,12 +3741,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3900,7 +3940,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3957,6 +3997,11 @@ p, li { white-space: pre-wrap; } <source>Country</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> + <translation type="unfinished"/> + </message> </context> <context> <name>LocationInformationModel</name> @@ -3980,28 +4025,28 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4019,8 +4064,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>Notas</translation> </message> @@ -4041,19 +4086,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>Temperatura do ar</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>Temperatura da água</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>Local</translation> </message> @@ -4118,123 +4163,123 @@ p, li { white-space: pre-wrap; } <translation>Duração</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>Informação</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation>Estatísticas</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>Fotos</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>Cilindros</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>Lastro</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation>OC</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>Temperatura do Ar [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>Temperatura da água [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>Esta viagem está sendo editada.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>Vários mergulhos estão sendo editados.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>Este mergulho está sendo editado.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>Notas da viagem</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>Local do mergulho</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>Descartar alterações?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation>Você está prestes a eliminar suas alterações.</translation> </message> @@ -4247,451 +4292,451 @@ p, li { white-space: pre-wrap; } <translation>A&rquivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>&Ver</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>&Ajuda</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>&Importar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>&Novo logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>Novo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>&Abrir logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>&Gravar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>Salvar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>Sal&var como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>Salvar como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>Fe&char</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>Fechar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>&Imprimir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>P&referencias</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>&Fechar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>Importar do &computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importar dados de &GPS pelo web service do Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>&Adicionar mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>&Renumerar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>Auto a&grupar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>Estatisticas Anuais</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>Lista de Mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>&Perfil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>&Informações</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>&Todos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation>Computador de mergulho anterior</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation>Próximo Computador</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>&Sobre o Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation>Manual</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>Planejador</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>Importar arquivos de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>Importar arquivos de mergulho de outros programas</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>Importar de &divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>&F Tela Cheia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>Alternar em Tela Cheia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation>&Buscar atualizações</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>&Exportar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>Alterna gráfico pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation>Alterna teto calculado pelo computador</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation>Alterna teto calculado</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation>Alterna calcular todos os tecidos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Alterna teto calculado com incrementos de 3m</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>Alterna batimentos cardiacos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>alterna MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>Alterna EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation>Alterna NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation>alterna taxa SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation>Anternar visualização da régua</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>Abrir arquivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Buscar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Aviso</translation> </message> @@ -4701,104 +4746,220 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Imprimir tabela</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Estatisticas Anuais</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>CSV</source> + <translation>CSV</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <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="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Salvar Alteraḉões?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <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="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Salvar arquivo como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Arquivos XML do Subsurface (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Abrir arquivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4806,7 +4967,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4814,22 +4975,22 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4837,7 +4998,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4887,7 +5048,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> + <source>Firmware files</source> <translation type="unfinished"/> </message> </context> @@ -4912,89 +5073,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>pés/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Ultima parada em 20 pés</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>pé(s)</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Ultima parada em 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -5108,8 +5269,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Arquivos XML do Subsurface (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5323,33 +5484,33 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Formato da data</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation>Formato da hora</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation type="unfinished"/> </message> @@ -5359,27 +5520,37 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Língua</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation>Reinicialização necessária</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Para carregar corretamente uma nova língua você deve reiniciar o Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> <translation type="unfinished"/> </message> </context> @@ -5790,45 +5961,70 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> - <source>Import template file</source> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> - <translation>Arquivos HTML (*.html)</translation> + <source>The template '%1' is read-only and cannot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> + <source>Import template file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> <translation type="unfinished"/> </message> </context> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (#%1 de %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> @@ -5838,22 +6034,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> @@ -5863,6 +6054,11 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation>(cil. %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> @@ -5895,7 +6091,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> @@ -5942,147 +6138,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6180,7 +6376,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6188,7 +6384,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation type="unfinished"/> </message> @@ -6196,7 +6392,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation type="unfinished"/> </message> @@ -6521,7 +6717,7 @@ Not all images have timestamps in the range between </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> + <source>Image files</source> <translation type="unfinished"/> </message> <message> @@ -6635,7 +6831,7 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> + <source>Import messages (errors, warnings, etc)</source> <translation type="unfinished"/> </message> <message> @@ -6645,76 +6841,82 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> + <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> <translation type="unfinished"/> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation>Médio</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation type="unfinished"/> @@ -6908,7 +7110,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7034,32 +7236,32 @@ Files with inappropriate date/time</source> <translation>Fotos</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation type="unfinished"/> </message> @@ -7237,7 +7439,7 @@ misturados com ar usando: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation type="unfinished"/> </message> @@ -7641,23 +7843,23 @@ misturados com ar usando: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Aceitar</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Buscar atualizações automaticamente</translation> </message> @@ -7916,8 +8118,8 @@ Lingua: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8041,21 +8243,12 @@ Médio</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8386,8 +8579,8 @@ Médio</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8472,15 +8665,10 @@ Médio</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> - <source>(%s) or (%s)</source> - <translation>(%s) ou (%s)</translation> - </message> - <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>ar</translation> </message> @@ -8490,27 +8678,27 @@ Médio</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>integrado</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>cinto</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>tornozelo</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8693,23 +8881,23 @@ Médio</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>desconhecido</translation> @@ -8851,93 +9039,93 @@ Médio</translation> <translation>Erro na análise da mistura de gás</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Não é possivel criar o analisador para %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Erro no registo dos dados</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Erro na análise das amostras</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Evento: aguardando ação do usuário</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Erro no registo do rótulo do evento.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Erro no registo do rótulo de cancelamento.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Erro ao importar os dados do mergulho</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Não é possivel criar contexto da libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Não se consegue abrir %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -8953,7 +9141,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation>Percentagem estranha na leitura %s @@ -8961,12 +9149,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation>Falha na análise de '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation>Falha na abertura da folha de estilo %s</translation> </message> @@ -8985,8 +9173,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation>Aviso:</translation> </message> @@ -9012,16 +9200,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation type="unfinished"/> @@ -9124,6 +9302,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>SAC</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9146,6 +9339,16 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> @@ -9191,22 +9394,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <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="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> @@ -9216,12 +9414,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Não é possivel achar gas o %s</translation> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9230,241 +9428,247 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1427"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation>Em deco </translation> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation>Em deco (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation>Teto calculado %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Tecido %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation type="unfinished"/> </message> @@ -10324,22 +10528,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1237"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> @@ -10352,117 +10556,117 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation>Lista de mergulhos</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation>Configurações</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation type="unfinished"/> </message> @@ -10565,51 +10769,56 @@ p, li { white-space: pre-wrap; } <translation>Planejando</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>min</translation> </message> @@ -10629,153 +10838,153 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation>Descer até o primeiro ponto</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> <source>Safety stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> <source>Conservatism level</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> <source>+</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> + <translation>Modo de mergulho</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>GFlow</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>SAC no fundo</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Notas</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>No planejador, mostrar tempo de mergulho absoluto das paradas</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>No planejador mostrar tempo relativo das paradas</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>No planejador, listar transições ou tratar elas de forma implicita</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation>Deco pO₂</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation>Deco SAC</translation> </message> diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts index 9c85552d2..59c055866 100644 --- a/translations/subsurface_pt_PT.ts +++ b/translations/subsurface_pt_PT.ts @@ -2579,76 +2579,76 @@ do GPS actual:</translation> <translation>Exportar o mergulho como macros TeX para o ficheiro.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Exportar ficheiro UDDF como</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> <source>UDDF files</source> <translation>Ficheiros UDDF</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> <source>CSV files</source> <translation>Ficheiros CSV</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> <source>HTML files</source> <translation>Ficheiros HTML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> <source>Subsurface files</source> <translation>Ficheiros do Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>TeX files</source> <translation>Ficheiros TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>Export CSV file as</source> <translation>Exportar ficheiro CSV como</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export world map</source> <translation>Exportar mapa mundo</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> <source>Export Subsurface XML</source> <translation>Exportar XML do Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Gravar profundidades das imagens</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Exportar para um ficheiro TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Exportar ficheiros HTML como</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>A exportar. Por favor aguarde...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Não é possível abrir o ficheiro %s</translation> </message> @@ -2989,41 +2989,61 @@ do GPS actual:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="157"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="192"/> - <location filename="../qt-models/diveplannermodel.cpp" line="277"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation>garr.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Profundidade final</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Tempo de mergulho</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Gás usado</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="381"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>Setpoint Circuito fechado</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>pé</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation>Tempos das paragens</translation> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3609,7 +3629,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Transferir</translation> </message> @@ -3635,7 +3655,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -3665,37 +3685,37 @@ p, li { white-space: pre-wrap; } <translation>Ligação:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Tentar novamente</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Sair</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>Mergulhos descarregados</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation>Informação:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Aceitar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Seleccionar todos</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Desmarcar todos</translation> </message> @@ -4620,13 +4640,13 @@ Tem a certeza que quer continuar?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>&Reverter</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>&Refazer</translation> </message> @@ -4666,20 +4686,20 @@ Tem a certeza que quer continuar?</translation> <translation>Colocar online o armazenamento remoto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="371"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="407"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Ligar a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="401"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Desligar de</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1593"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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> @@ -4690,39 +4710,39 @@ Tem a certeza que quer continuar?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="674"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="629"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation>Não gravar um ficheiro vazio remotamente</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="670"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Atravessar as pastas das imagens</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Procurar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>A procurar imagens... (pode demorar um pouco)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="707"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="858"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="968"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Aviso</translation> </message> @@ -4732,12 +4752,12 @@ Tem a certeza que quer continuar?</translation> <translation>A tentar juntar mergulhos com %1min de intervalo entre eles</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> <source>Template backup created</source> <translation>Criada cópia de segurança do modelo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> <source>The following backup printing templates were created: %1 @@ -4758,202 +4778,202 @@ Localização: Por favor tenha em atenção que a partir desta versão do Subsurface os modelos padrão são ficheiros apenas de leitura e não devem ser editados directamente, uma vez que a aplicação poderá criá-los novamente no arranque.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="732"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="858"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="910"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Imprimir tabela de runtime</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="968"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Está a tentar planear novamente um mergulho que não foi criado no planeador de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>A tentar editar um mergulho que não foi criado manualmente.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1110"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Estatísticas anuais</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1331"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> <source>Dive log files</source> <translation>Ficheiros de registo de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1622"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> <source>Subsurface files</source> <translation>Ficheiros do Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> <source>MkVI files</source> <translation>MkVI files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> <source>All files</source> <translation>Todos os ficheiros</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="../desktop-widgets/mainwindow.cpp" line="1382"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <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="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Guardar alterações?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <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="../desktop-widgets/mainwindow.cpp" line="1621"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Guardar ficheiro como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1709"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[cache local para] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1711"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[armazenamento remoto para] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1812"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>A abrir ficheiro de uma versão mais antiga</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1813"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Abriu um ficheiro de uma versão antiga do Subsurface. Recomendamos que leia o manual para saber mais sobre as alterações para esta nova versão, especialmente no que respeita a gestão de locais de mergulho, que sofreu alterações importantes. O Subsurface tentou preencher os dados, mas pode ser importante rever o novo sistema de gestão dos locais de mergulho para garantir que tudo está correcto.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Abrir ficheiro de registo de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>A contactar o serviço remoto...</translation> </message> @@ -5070,89 +5090,89 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Circuito aberto</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Última paragem aos 20 ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% da profundidade média para 6 m/20 ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>6 m/20 ft para a superfície</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>pé</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Última paragem aos 6 m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% da profundidade média para 6 m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6 m para a superfície</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -6014,17 +6034,17 @@ Por favor exporte o modelo para outro ficheiro.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation>(#%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Computador de mergulho desconhecido</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>A visualização do NDL /TTS foi desactivada devido ao excessivo tempo de processamento</translation> </message> @@ -6039,12 +6059,12 @@ Por favor exporte o modelo para outro ficheiro.</translation> <translation>Marca do computador de mergulho principal</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation>Mergulho planeado</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation>Mergulho adicionado manualmente</translation> </message> @@ -7244,32 +7264,32 @@ Files with inappropriate date/time</source> <translation>Fotos</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Carregar imagens do(s) ficheiro(s)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Carregar imagens da web</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>Apagar imagens seleccionadas</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>Apagar todas as imagens</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>A eliminar imagens</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>Tem a certeza que quer apagar todas as imagens?</translation> </message> @@ -7851,24 +7871,24 @@ obtidos a partir do ar usando: <translation>O servidor retornou a informação seguinte:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>O Subsurface verifica a existência de novas versões a cada duas semanas. Se não desejar que tal aconteça, por favor clique em Declinar.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Declinar</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Aceitar</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Verificar automaticamente a existência de actualizações</translation> </message> @@ -8592,8 +8612,8 @@ Média</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1144"/> - <location filename="../core/planner.c" line="1147"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>oxigénio</translation> </message> @@ -8680,8 +8700,8 @@ Média</translation> <message> <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1140"/> - <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>ar</translation> </message> @@ -9216,11 +9236,6 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation>Runtime: %dmin %s</translation> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime: %dmin<br></div></translation> @@ -9365,6 +9380,11 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo <translation>plano de mergulho </b> (foram detectados mergulhos sobrepostos)</translation> </message> <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation>Runtime: %dmin%s</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Modelo Deco: Bühlmann ZHL-16C com GFLow = %d%% e GFHigh = %d%%</translation> @@ -9430,7 +9450,7 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo <translation>Não foi possível encontrar o gás %s</translation> </message> <message> - <location filename="../core/planner.c" line="1148"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> @@ -10628,11 +10648,6 @@ O Uemis Zurich está correctamente ligado?</translation> <translation>Descarregar do computador de mergulho</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="156"/> - <source>Apply GPS Fixes</source> - <translation>Aplicar posições de GPS</translation> - </message> - <message> <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>Sincronizar manualmente com a nuvem </translation> @@ -10668,6 +10683,11 @@ O Uemis Zurich está correctamente ligado?</translation> <translation>Carregar dados GPS</translation> </message> <message> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation>Aplicar as posições de GPS</translation> + </message> + <message> <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Descarregar dados GPS</translation> diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts index b6c2f2f65..0f92ab379 100644 --- a/translations/subsurface_ro_RO.ts +++ b/translations/subsurface_ro_RO.ts @@ -47,66 +47,86 @@ <translation>Selecția dispozitivului Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Dispozitive descoperite</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Salvare</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Ieșire</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Scanare</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Ștergere</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Detalii despre dispozitivul Bluetooth local</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Nume: </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Adresă: </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Dispozitivul Bluetooth este pornit</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Pornește/Oprește</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Selectează diospozitiv:</translation> @@ -117,22 +137,22 @@ <translation>Nume:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation>Nu s-a putut initializa Winsock versiunea 2.2</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation>Se încearcă pornirea dispozitivului Bluetooth local...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation>Se încearcă oprirea dispozitivului Bluetooth local...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation>Lista cu dispozitivele descoperite a fost golită.</translation> </message> @@ -164,22 +184,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation>NEÎMPERECHEAT</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation>ÎMPERECHEAT</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation>ÎMPERECHEAT_CU_AUTORIZARE</translation> </message> @@ -189,113 +209,113 @@ <translation>%1 (%2) [Stare: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Dispozitivul %1 poate fi folosit pentru conexiune. Pentru a continua apăsați butonul de salvare.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Dispozitivul %1 trebuie împerechat înainte de folosire. Pentru a împerechea dispozitivele folosiți meniul contextual.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation>Un dispozitiv are nevoie de o adresa diferita de zero pentru conexiune.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation>Dispozitivul local a fost schimbat.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation>Împerechere</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation>Desperechere</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation>Se încearcă împerecherea cu %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation>Se încearca desperecherea cu %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation>Dispozitivul %1 a fost desperecheat.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation>Dispozitivul %1 a fost împerecheat.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation>Dispozitivul %1 a fost împerecheat cu autorizare.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Dispozitivul %1 poate fi folosit pentru conexiune. Pentru a continua apăsați butonul de salvare.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation>A apărut o eroare legată de dispozitivul local: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Eroare la împerechere. Dacă dispozitivul cu care se dorește împerecherea are nevoie de un cod PIN customizat, vă rugăm să împerecheați dispozitivele folosind utilitarul sistemului de utilizare.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation>Eroare necunoscută.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Adaptorul Bluetooth nu este pornit. Pentru a descoperi alte dispozitive, acesta trebuie pornit.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Încercarea de scriere/citire s-a finalizat cu o eroare.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation>A apărut o eroare necunoscută.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation>A apărut o eroare la descoperirea dispozitive: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>Indisponibil</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Adaptorul Bluetooth local nu poate fi accesat.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Agentul folosit pentru descoperirea dispozitivelor Bluetooth nu a fost creat deoarece nu există niciun dispozitiv Bluetooth local ce are adresa %1.</translation> </message> @@ -316,7 +336,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>Niciun însoțitor</translation> </message> @@ -1636,84 +1656,84 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Crează copie de rezervă pentru setărilor dispozitivului de scufundări</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> - <translation>Fișiere de rezervă (*.xml)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>Eroare restaurare copie de rezervă XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>A apărut o eroare în timp ce se salva fișierul de rezervă. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Restaurarea copiei de rezervă s-a terminat cu succes</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>Setările au fost salvate în fișierul: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Restaurează setările dispozitivului de scufundare</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>Eroare restaurare XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>A apărut o eroare în timp ce se restaura fișierul de rezervă. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>Restaurare finalizată cu succes</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>Setările au fost restaurate cu succes</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Selectează fișierul de firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> - <translation>Toate fișierele (*.*)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> - <translation>Alege-ți fisier pentru logul computerului</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> - <translation>Fișiere de log (*.log)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> + <translation>Alege-ți fisier pentru logul computerului</translation> </message> </context> <context> @@ -1793,27 +1813,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>Făcând click aici veți înlătura acest tub.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Adancime de schimbare gaz deco. Calculata folosind valoarea predefinita pO₂, daca nu a fost setata manual</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Calculat folosing Opțiunea pO₂ la Fund. Setând MOD se ajustează O₂%, setați '*' pentru O₂% optim la adancime maximă.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Calculat folosind Opțiunea Amestecul cel mai bun END. Setând MND ajustează He%, setați '*'pentru cel mai bun He% la adâncimea maximă.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Acestă butelie de gaz incă se folosește. Doar buteliile ce nu sunt folosite în scufundare pot fi șterse.</translation> </message> @@ -1927,27 +1947,27 @@ computerul de scufundări selectat?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation>Detalii scufundare</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Stergere scufundare</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation>Afisare pe harta</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation>Mai mult de 1 buddy</translation> </message> @@ -1955,104 +1975,104 @@ computerul de scufundări selectat?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation>Scufundare %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Dată:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Locație:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation>Coordonate:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation>Foloseste posizitia GPS curenta:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Adancime:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Durată:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Temperatura aer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Temperatura apa:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Costum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Însoțitor:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Maestru scufundare:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Lest:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation>Butelie:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation>Mix de gaze:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation>Presiune initiala:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation>Presiune finala:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Rating:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Notițe:</translation> </message> @@ -2128,23 +2148,23 @@ GPS curenta:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation> (but. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>Schimbare manuală la OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation> început</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation> sfârșit</translation> @@ -2309,12 +2329,12 @@ GPS curenta:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Crearea unei noi locații de scufundare prin copierea informațiilor relevante din cea curentă.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation>Crearea unei noi locații de scufundare cu numele curent</translation> </message> @@ -2559,76 +2579,76 @@ GPS curenta:</translation> <translation>Salveaza scufundarea in fisier ca macro in format TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Exportă ca fișier UDDF</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>Fișiere UDDF (*.uddf *.UDDF)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <source>UDDF files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> - <translation>Exporă ca fișier CSV</translation> + <source>CSV files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>Fișiere CSV (*csv *.CSV)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <source>HTML files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> - <translation>Exportă harta lumii</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>Fișiere HTML (*.html)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>TeX files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> - <translation>Exportă XML Subsurface</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <source>Export CSV file as</source> + <translation>Exporă ca fișier CSV</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>Fișiere XML (*.xml *.ssrf)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <source>Export world map</source> + <translation>Exportă harta lumii</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <source>Export Subsurface XML</source> + <translation>Exportă XML Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Salvează adâncimile imaginii</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Exporta in fisier TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> - <translation>Fisiere TeX (*.tex)</translation> - </message> - <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Exportă ca fișier HTML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Vă rugăm aștepați, se exportă...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Nu se poate deschide fișierul %s</translation> </message> @@ -2923,7 +2943,7 @@ GPS curenta:</translation> <translation><numerusform>(%n scufundare(i))</numerusform><numerusform>(%n scufundare(i))</numerusform><numerusform>(%n scufundare(i))</numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation>Mai mult de 1 buddy</translation> </message> @@ -2969,41 +2989,61 @@ GPS curenta:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>necunoscut</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Adâncime finală</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Timp de rulare</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Durată</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Gaz folosit</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>Valorare CC de refetință</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>picioare</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3036,107 +3076,107 @@ GPS curenta:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Adâncime</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Timp</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Presiune</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Temperatură</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Culoare</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Utilizatorul a intrat</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Presiune S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Presiunea I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Plafon</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Punct setat</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Senzor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Senzor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Senzor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Presiunea ambientală</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>Puls</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>Factorul gradient</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>Adâncime medie @ s</translation> </message> @@ -3456,71 +3496,71 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Descarcă</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation>Descărcarea datelor folosind Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Eroare</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Găsește calculatorul de scufundări Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation>Anulare descărcare</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation>Alege-ți fișier pentru descărcarea logului computerului</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation>Alege-ți fișier pentru fișierul sursa binar al computerului</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> - <translation>Reîncearcă descărcarea</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> - <translation>Fișiere de log (*.log)</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> + <translation>Reîncearcă descărcarea</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Avertizare</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Salvând dump-ul libdivecomputer nu se vor mai descărca scufundările din listă.</translation> </message> - <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> - <translation>Fișiere dump (*.bin)</translation> - </message> </context> <context> <name>DownloadFromDiveComputer</name> @@ -3589,7 +3629,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Descarcă</translation> </message> @@ -3615,7 +3655,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Anulează</translation> </message> @@ -3645,37 +3685,37 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Reîncearcă</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Ieșire</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>Scufundari descarcate:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation>Informație:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Acceptă</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Selectează totul</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Deselecteaza tot</translation> </message> @@ -3706,12 +3746,12 @@ p, li { white-space: pre-wrap; } <translation>Conectați-vă la locul text din Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Pentru a deconecta Subsurface de la contul Facebook, folosiți 'Partajați ca' din meniu.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Pentru a vă conecta la Facebook, va rugăm să vă autentificați. Acesta va permite aplicației Subsurface să publice scufundările pe timeline-ul dumneavoastă</translation> </message> @@ -3905,7 +3945,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation>Nu a fost setată nicio locație</translation> </message> @@ -3962,6 +4002,11 @@ p, li { white-space: pre-wrap; } <source>Country</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> + <translation type="unfinished"/> + </message> </context> <context> <name>LocationInformationModel</name> @@ -3985,29 +4030,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation>Administrarea locației pentru scufundare</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> <translation>Unește cu locația curentă</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> <translation>Unirea locațiilor pentru scufundări</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation>Sunteți pe cale să uniți locațiile și nu mai există cale de întoarcere. Sigur doriți să continuați?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation>Sunteți in modul de editare a locației de scufundare</translation> </message> @@ -4025,8 +4070,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>Notițe</translation> </message> @@ -4047,19 +4092,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>Temperatura aerului</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>Temperatura apei</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>Locație</translation> </message> @@ -4124,123 +4169,123 @@ p, li { white-space: pre-wrap; } <translation>Durată</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation>Informații suplimentare</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>Informații</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation>Statistici</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>Fotografii</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation>Aplică modificările</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation>Renunță la modificări</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>Butelii</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation>Adaugă butelie</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>Greutăți</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation>Adaugă sistem de greutate</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation>OC</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation>Scufundare libera</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>Temperatura aerului [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>Temperatura apei [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>Această excursie este editată.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>Scufundări multiple sunt editate.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>Această scufundare este editată.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>Notițe excursie</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>Locație excursie</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation>Locație de scufundare nouă</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>Renunțați la modificări?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation>Sunteți pe cale să renunțați la modificări.</translation> </message> @@ -4253,451 +4298,451 @@ p, li { white-space: pre-wrap; } <translation>&Fișier</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>&Afișare</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>&Ajutor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>&Importați</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation>&Editează</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> <translation>&Partajează</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>&Jurnal nou</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>Nou</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>&Deschide jurnal</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>Deschide</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>&Salvează</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>Salvează</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>Sa&lvează ca</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>Salvează ca</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>&Închide</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>Închide</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>&Printează</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>P&referințe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>&Închide</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>Importă din computerul de &scufundări</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importă &datele GPS din serviciul web Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> <translation>Editează numele &dispozitivelor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>&Adăugați scufundări</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation>&Editează scufundarea</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation>&Copiază componetele scufundării</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation>&Lipește componentele scufundării</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>&Renumerotează</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>Grupare &automată</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>&Statistici anuale</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>&Lista scufundărilor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>&Informații</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>&Toate</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation>DC& anterior</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation>&Următorul DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>&Despre Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation>Manual &utilizator</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>P&lanul scufundării</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>&Importați fișierele cu înregistrări</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>&Importați înregistrările scufundărilor din alte aplicații</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>Importă &de pe divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>&Expandare ecran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>Comutați ecranul expandat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation>Verifică ultimele actualizări</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>&Exportă</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation>Exportați înregistrările scufundărilor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation>Configurați &calculatorul de scufundări</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation>Editează &scufundarea din planificator</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation>Comutați graficul pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation>Comutați graficul pN₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>Comutați graficul pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation>Comutați rapoartele plafonului DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation>Comutați plafoanele calculate</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation>Comutați calculul țesăturilor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Comutați plafoanele calculate incremental cu 3m</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>Comutați pulsul</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>Comutați MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>Comutați EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation>Comutați NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation>Comutați rata SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation>Comutați conducătorul</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation>Scalați graficul</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation>Comutați imaginile</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> - <translation>Comutați bara rezervorului</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation>&Filtrați lista scufundărilor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation>Alterneaza afișarea diagramei de saturație a țesuturilor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation>Chestionar &utilizator</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>&Anulează</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>&Refă</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation>&Caută imaginile mutate</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation>Deschide stocarea în cloud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation>Salvează în cloud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation>&Administrează locațiile scufundărilor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation>Editarea locației scufundării</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation>Obține stocare cloud online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Conectați-vă la</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Deconectați-vă de la</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>Deschideți fișier</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Anulează</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Imagine direcții traverse</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Scanare</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>Scanare imagini ... (poate dura mai mult timp)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Avertizare</translation> </message> @@ -4707,105 +4752,221 @@ p, li { white-space: pre-wrap; } <translation>Incercare de unire scufundări cu interval de %1min între</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Printați tabelul de execuție</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Încercare de replanificare scufundare ce nu este o scufundare planificată</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Vă rugăm să terminați editarea curentă înainte de a începe una nouă.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Încercare de modificare a unei scufundări ce nu a fost adăugată manual.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Statistici anuale</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>CSV</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Doriți să salvați modificările efectuare în fișierul %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Doriți să salvați modificările efectuare în fișierul de date?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Doriți să salvați modificările?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <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="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Salvează ca</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Fișiere XML Subsurface (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[cache local pentru] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[intregistrare din cloud pentru] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>Deschidere fisier de date din o versiune mai veche</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>A-ți deschis un fisier cu date din o versiune mai veche a Subsurface. Recomandăm citirea manualului pentru a afla despre schimbările din noua versiune, în special despre administrarea locurilor de scufundare, modul a suferit modificări majore. Subsurface a încercat deja să pre-populeze datele dar ar trebui să verificați noul sistem de administrare a locurilor de scufundare și să vă asigurați că totul a decurs fără erori.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Deschideți înregistrările scufundărilor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation>Fișiere scufundare (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Fișiere Cochran (*.can *.CAN);;CSV files (*.csv *.CSV);;Fișiere DiveLog.de (*.dld *.DLD);;Fișiere JDiveLog (*.jlb *.JLB);;Fișiere Liquivision (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Fișiere Suunto (*.sde *.db *.SDE *.DB);;Fișiere Divesoft (*.dlf *.DLF);;Fișiere UDDF/UDCF(*.uddf *.udcf *.UDDF *.UDCF);;Fișiere XML (*.xml *.XML);;Fișiere APD (*.apd *.APD);;Fișiere Datatrak/WLog (*.log *.LOG);;Fișiere OSTCtools (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>Se contactează serviciul cloud</translation> </message> @@ -4813,7 +4974,7 @@ Subsurface a încercat deja să pre-populeze datele dar ar trebui să verificaț <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4821,22 +4982,22 @@ Subsurface a încercat deja să pre-populeze datele dar ar trebui să verificaț <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4844,7 +5005,7 @@ Subsurface a încercat deja să pre-populeze datele dar ar trebui să verificaț <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4896,8 +5057,8 @@ Dacă dispozitivul dvs. folosește Bluetooth, faceți aceleași pregatiri ca și </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> - <translation>Fișiere Firmware (*.hex *.bin)</translation> + <source>Firmware files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4921,89 +5082,89 @@ Dacă dispozitivul dvs. folosește Bluetooth, faceți aceleași pregatiri ca și <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Circuit deschis</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Ultima oprire la 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% adâncime medie până la 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20ft pană la suprafață</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>picioare</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Ultima oprire la 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% adâncime medie pană la 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6m pană la suprafață</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>metri cubi/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>livre pe inch pătrat</translation> </message> @@ -5117,8 +5278,8 @@ Dacă dispozitivul dvs. folosește Bluetooth, faceți aceleași pregatiri ca și </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Fișiere XML Subsurface (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5332,33 +5493,33 @@ Dacă dispozitivul dvs. folosește Bluetooth, faceți aceleași pregatiri ca și <translation>Format dată</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation><html><head/><body><p>Format dată preferat. Câmpurile cel mai des folosite sunt</p><p>z(ziua lunii)</p><p>zzz(nume zi prescurtat)</p><p>L(număr lună)</p><p>LLL(nume lună prescurtat)</p><p>aa/aaaa(anul în format de 2 sau 4 cifre)</p></body></html></translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation>Folosește limba implicită în interfață</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation>Este folosit în locurile unde nu este spațiu pentru afișarea datei întregi</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation>Formatare scurtă</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation>Format dată</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation><html><head/><body><p>Format preferat ora </p><p>Formatele folosite de obicei sunt</p><p>o(ora in format 12h)</p><p>O(ora in format 24h)</p><p>mm(minutul cu 2 cifre)</p><p>ss(secunda cu 2 cifre)</p><p>am/pm(a/p sau am/pm)</p></body></html> </translation> </message> @@ -5368,30 +5529,38 @@ Dacă dispozitivul dvs. folosește Bluetooth, faceți aceleași pregatiri ca și <translation>Limbă</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation>Este necesară o repornire</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Pentru a încărca corect o nouă limbă trebuie să restartați Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation>Caractere literale</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> - <translation>Caractere non-standard in formatul orei. -Aceste vor fi folosite ca atare. Se poate să nu fie ceea ce intenționați. -A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5801,45 +5970,70 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and cannot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>Importă fișier șablon</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> - <translation>Fișiere HTML (*.html)</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>Exportă fișierele șablon ca</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation>Acestă acțiune nu poate fi anulată!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>Șterge șablonul: %1?</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation type="unfinished"/> </message> </context> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation>(#%1 din %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Calculator de scufundări necunoscut</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Arată NDL / TTS a fost dezactivat din cauza timpului excesiv de procesare</translation> </message> @@ -5849,22 +6043,17 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Adaugă gazul modificat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation> (Rezervor %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Definește ca primul computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation>Scufundare planificată</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation>Scufundare adăugată manual</translation> </message> @@ -5874,6 +6063,11 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Șterge acest computer</translation> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation> (but. %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Adaugă schimbare de setpoint</translation> @@ -5906,8 +6100,8 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> - <translation>Ajustează presiunea rezervorului %1 (în momentul de față aceasta este interpolată ca %2)</translation> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> @@ -5953,147 +6147,147 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation>Se incarcă...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation>Deschide fișier local cu scufundări</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation>Eroare deschidere fișier cu scufundări local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 scufundări încărcate din fișier local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation>operare în mod local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>E-mailul și parola de cloud pot conține doar litere, numere și '.', '-', '_', și '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> <translation>Locatie GPS necunoscuta</translation> </message> @@ -6191,7 +6385,7 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6199,7 +6393,7 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation>h</translation> </message> @@ -6207,7 +6401,7 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation type="unfinished"/> </message> @@ -6532,7 +6726,7 @@ Not all images have timestamps in the range between </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> + <source>Image files</source> <translation type="unfinished"/> </message> <message> @@ -6646,7 +6840,7 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> + <source>Import messages (errors, warnings, etc)</source> <translation type="unfinished"/> </message> <message> @@ -6656,81 +6850,87 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> + <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> + <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> <translation type="unfinished"/> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation>Mediu</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation>Timpul scufundării: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation>Durata: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation>Locația scufundării: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation>Însoțitor: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation>Maestru scufundări: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation> @@ -6925,7 +7125,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation>Niciun costum setat</translation> </message> @@ -7051,32 +7251,32 @@ Files with inappropriate date/time</source> <translation>Fotografii</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Încărcarea imaginilor din fișier</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Încărcarea imaginilor de pe web</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation type="unfinished"/> </message> @@ -7253,7 +7453,7 @@ mixate cu aer și folosite:</translation> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>Etichete goale</translation> </message> @@ -7657,23 +7857,23 @@ mixate cu aer și folosite:</translation> <translation>Server-ul a returnat următoarea informație:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Refuză</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Acceptă</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Verificare automată a actualizărilor</translation> </message> @@ -7935,8 +8135,8 @@ Limba: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8060,21 +8260,12 @@ Medie</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8405,8 +8596,8 @@ Medie</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>oxigen</translation> </message> @@ -8491,15 +8682,10 @@ Medie</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> - <source>(%s) or (%s)</source> - <translation>(%s) sau (%s)</translation> - </message> - <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>aer</translation> </message> @@ -8509,27 +8695,27 @@ Medie</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>integrat</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>curea</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>gleznă</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8712,23 +8898,23 @@ Medie</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>necunoscut</translation> @@ -8870,93 +9056,93 @@ Medie</translation> <translation>Eroare parsând amestecul de gaz</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Nu s-a putut crea parser pentru %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Eroare înregistrând datele</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Eroare parsând eșantioanele</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Eveniment: aștept acțiunea utilizatorului</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Eroare la înregistrarea handlerului de evenimente.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Eroare la înregistrarea handlerului de anulare.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Eroare la importarea datelor despre scufundare</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Nu s-a putut crea contextul libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Nu s-a putut deschide %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -8972,19 +9158,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation>Valoare procentuală neobișnuită %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation>Nu s-a putut parsa '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation>Nu s-a putut deschide stylesheet-ul %s</translation> </message> @@ -9003,8 +9189,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation>Avertizare:</translation> </message> @@ -9030,16 +9216,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation type="unfinished"/> @@ -9142,6 +9318,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>SAC</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9164,6 +9355,16 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> @@ -9209,22 +9410,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valoare pO₂ mare %.2f la %d:%02u cu gazul %s la adâncimea %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valoare pO₂ mică %.2f la %d:%02u cu gazul %s la adâncimea %.*f %s</translation> </message> @@ -9234,12 +9430,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Gazul %s nu a fost găsit</translation> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9248,244 +9444,250 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation>Decompresie: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1427"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation>În decompresie </translation> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Decompresie: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation>În decompresie (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation>Limita calculată %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Țesut %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation>producere: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation>adâncimea medie pana aici %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation type="unfinished"/> </message> @@ -10348,22 +10550,22 @@ Este conectat corect dispozitivul Uemis Zurich?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1237"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> @@ -10376,117 +10578,117 @@ Este conectat corect dispozitivul Uemis Zurich?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation>Lista scufundari</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation>Parametri</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation>Incarcă datele GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Descarcă datele GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation>Arată cache GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation>Goliți cache GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation>Dezvoltator</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation>Jurnal aplicație</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation>Informații despre tip interfață</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation>Despre</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation>Porniți serviciul de localizare</translation> </message> @@ -10589,51 +10791,56 @@ p, li { white-space: pre-wrap; } <translation>Planificare</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation>Decompresie VPM-B</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation>Decompresie Bühlmann</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation>Gaz de rezervă</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation>Pauze backgas planificate</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>min</translation> </message> @@ -10653,153 +10860,153 @@ p, li { white-space: pre-wrap; } <translation>Mod recreațional</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation>Elimimă prima adâncime</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> <source>Safety stop</source> <translation>Oprire de siguranță</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> <source>Conservatism level</source> <translation>Nivel conservare</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> + <translation>Mod de scufundare</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation>Opțiuni gaz</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation>Factor SAC</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation>Timp de rezolvare a problemei</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation>Folosit pentru a calcula minimul de gaz. Timpul adițional la adâncime maximă după un eveniment OoG.</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation>Folosit în calcularea celui mai bun mix. Selectați cel mai bun mix la adâncime în tabelul "Gaze Disponibile" intoducând adâncimea gazului, urmat de "B" (cel mai bun mix trimix) sau "BN" (cel mai bun mix nitrox)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>GF scăzut</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>GF ridicat</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation>Limită pO₂</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation>Cel mai bun mix END</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Notițe</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>Afișează în planul de scufundare timpul de execuție (timpul absolut) al opririlor</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation>Afișează timpul rulării</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>Afișează în planul de scufundare timpul de execuție (timpul relativ) al opririlor</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation>Afișează durata segmentului</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>Afișează în planul de scufundare lista de tranziții sau tratează-le ca fiind implicite</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation>Afișează tranzițiile de decompresie</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation>Plan de scufundare textual</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation>Decompresie pO₂</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation>Decompresie SAC</translation> </message> diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index 57dd031a9..7b4610f6c 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -47,66 +47,86 @@ <translation>Выбор удаленного устройства Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Найденные устройства</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Сканировать</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Очистить</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Локальное устройство Bluetooth:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Название:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Адрес:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth включен</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Вкл/Выкл</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Выберите устройство:</translation> @@ -117,22 +137,22 @@ <translation>Название:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation>Ошибка инициализации Winsock 2.2</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation>Включение локального устройства Bluetooth...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation>Выключение локального устройства Bluetooth...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation>Список удаленных устройств очищен.</translation> </message> @@ -164,22 +184,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation>Не сопряжено</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation>Сопряжено</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation>Авторизовано,Сопряжено</translation> </message> @@ -189,113 +209,113 @@ <translation>%1 (%2) [Состояние: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Устройство %1 может быть использовано для подключения. Нажмите кнопку Сохранить.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Чтобы использовать %1, оно должно быть сопряжено. Используйте контекстное меню для сопряжения.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation>Локальное устройство было изменено.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation>Сопряжение</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation>Удалить сопряжение</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation>Попытка сопряжения с %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation>Попытка удалить сопряжение с %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation>Устройство %1 не сопряжено.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation>Устройство %1 сопряжено.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation>Устройство %1 авторизовано и сопряжено.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Устройство %1 может быть использовано для соединения. Нажмите кнопку Сохранить.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation>Ошибка локального устройства: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Ошибка сопряжения. Если устройство требует специальный PIN-код, попробуйте сопряжение средствами операционной системы.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation>Неизвестная ошибка</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Адаптер Bluetooth выключен, включите его перед выполнением поиска.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Ошибка по время чтения/записи устройства.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation>Произошла неизвестная ошибка.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation>Ошибка обнаружения устройства: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>Недоступно</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Ошибка доступа к локальному Bluetooth-адапетру.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Адрес %1 не соответствует ни одному адресу локального устройства Bluetooth. Обнаружение не будет выполнено.</translation> </message> @@ -316,7 +336,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>Без напарника</translation> </message> @@ -1636,84 +1656,84 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Создать рез. копию настроек</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> - <translation>Резервные копии (*.xml)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>XML-ошибка при создании рез. копии</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>Ошибка при сохранении резервной копии. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Резервная копия создана</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>Ваши настройки сохранены в %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Восстановить настройки дайвкомпьютера</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>XML-ошибка при восстановлении</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Ошибка при восстановлении из рез. копии. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>Восстановление успешно</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>Настройки были успешно восстановлены.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Выберите файл прошивки</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> - <translation>Все файлы (*.*)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> - <translation>Выберите файл для протокола загрузки из дайв-компьютера</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> - <translation>Файлы журналов (*.log)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> + <translation>Выберите файл для протокола загрузки из дайв-компьютера</translation> </message> </context> <context> @@ -1793,27 +1813,27 @@ <translation>л</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>Нажмите здесь чтобы удалить этот баллон.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Глубина переключения на деко-газ. Рассчитывается из настроек деко pO₂, если не указано вручную.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Вычислено с учетом настройки донного pO₂. Ввод MOD меняет O₂%, установите '*' для лучшего O₂% на макс. глубине.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Вычислено с учетом настройки END лучшей смеси. Ввод MND меняет He%, установите '*' для лучшего He% на макс. глубине.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Этот газ используется. Можно удалять только те баллоны, которые не используются.</translation> </message> @@ -1927,27 +1947,27 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation>Детали погружения</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Удалить погружение</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation>Показать на карте</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation>Несколько напарников</translation> </message> @@ -1955,104 +1975,104 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation>Погружение %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Дата:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Место:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation>Координаты:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation>Использовать текущее местоположение GPS:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Глубина:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Длительность:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Темп. воздуха:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Темп. воды:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Костюм:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Напарник:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Инструктор:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Вес:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation>Баллон:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation>Смесь:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation>Нач. давление:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation>Кон. давление:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Рейтинг:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Заметки:</translation> </message> @@ -2128,23 +2148,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation> (баллон %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>Ручной переход на ОЦ</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation> начало</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation> конец</translation> @@ -2309,12 +2329,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Создать новый дайв-сайт, заполнив данными из текущего погружения.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation>Создать дайв-сайт с этим наванием</translation> </message> @@ -2559,76 +2579,76 @@ GPS location:</source> <translation>Сохранить погружение как макрос TeX.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Файл для UDDF экспорта</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>UDDF файлы (*.uddf *.UDDF)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <source>UDDF files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> - <translation>Файл для CSV экспорта</translation> + <source>CSV files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>CSV файлы (*.csv *.CSV)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <source>HTML files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> - <translation>Файл для экспорта карты</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>HTML файлы (*.html)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>TeX files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> - <translation>Экспорт Subsurface XML</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <source>Export CSV file as</source> + <translation>Файл для CSV экспорта</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>XML файлы (*.xml *.ssrf)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <source>Export world map</source> + <translation>Файл для экспорта карты</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <source>Export Subsurface XML</source> + <translation>Экспорт Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Экспорт глубин фотографий</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Экспорт в TeX-файл</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> - <translation>Файлы TeX (*.tex)</translation> - </message> - <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Экспортировать HTML файл как</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Ожидайте, идет экспорт...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Невозможно открыть файл %s</translation> </message> @@ -2923,7 +2943,7 @@ GPS location:</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation>Несколько напарников</translation> </message> @@ -2969,41 +2989,61 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Отсчет</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Исп. газ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>Установка ребризера</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>мин</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>м</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>фут</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3036,107 +3076,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Время</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Давление</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Температура</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Цвет</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Пользователь</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Давление S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Давление I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Потолок</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Установка</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Сенсор 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Сенсор 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Сенсор 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Внешнее давление</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>Пульс</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>Градиент-фактор</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>Средняя глубина @ s</translation> </message> @@ -3456,71 +3496,71 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Загрузить</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation>Выберите режим загрузки по Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Найти дайвкомпьютер Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation>Отменить загрузку</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation>Выберите файл для протокола загрузки из дайв-компьютера</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation>Выберите файл для двоичного дампа из дайв-компьютера</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> - <translation>Повторить загрузку</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> - <translation>Файлы журналов (*.log)</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> + <translation>Повторить загрузку</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>При сохранении дампа, погружения в журнал НЕ загружаются.</translation> </message> - <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> - <translation>Дамп-файлы (*.bin)</translation> - </message> </context> <context> <name>DownloadFromDiveComputer</name> @@ -3589,7 +3629,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Загрузить</translation> </message> @@ -3615,7 +3655,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Отмена</translation> </message> @@ -3645,37 +3685,37 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Повторить</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>Загруженные погружения</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Принять</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Выбрать все</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Отменить выделение</translation> </message> @@ -3706,12 +3746,12 @@ p, li { white-space: pre-wrap; } <translation>Соединение с Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Чтобы отключиться от Facebook, используйте пункт меню "Поделиться".</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Авторизуйтесь чтобы подключиться к Facebook. После этого Subsurface сможет публиковать погружения в хронике.</translation> </message> @@ -3905,7 +3945,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation>Место не указано</translation> </message> @@ -3962,6 +4002,11 @@ p, li { white-space: pre-wrap; } <source>Country</source> <translation>Страна</translation> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> + <translation type="unfinished"/> + </message> </context> <context> <name>LocationInformationModel</name> @@ -3985,29 +4030,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation>Управление дайв-сайтами</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> <translation>Объеденить с текущим сайтом</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> <translation>Объединение дайв-сайтов</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation>Операция объединения дайв-сайтов необратима. Вы желаете продолжить?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation>Редактирование дайв-сайта</translation> </message> @@ -4025,8 +4070,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>Основное</translation> </message> @@ -4047,19 +4092,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>Темп. воздуха</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>Темп. воды</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -4124,123 +4169,123 @@ p, li { white-space: pre-wrap; } <translation>Длительность</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation>Дополнительно</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>Информация</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation>Статистика</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>Фотографии</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation>Применить изменения</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation>Отменить изменения</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>Баллоны</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation>Добавить баллон</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>Грузы</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation>Добавить грузовую систему</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation>Откр. цикл</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation>Фридайв</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>Темп. воздуха [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>Темп. воды [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>Редактирование поездки.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>Множественное редактирование.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>Редактирование погружения.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>Поездка</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>Местоположение</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation>Новый дайв-сайт</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>Отменить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation>Вы собираетесь отменить свои изменения.</translation> </message> @@ -4253,451 +4298,451 @@ p, li { white-space: pre-wrap; } <translation>Файл</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>Журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>Вид</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>Помощь</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>Импорт</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation>Редактирование</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> <translation>Поделиться</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>Новый журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>Новый</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>Печать</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>Настройки</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>Импорт из дайвкомпьютера</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>Импорт координат из веб-сервиса Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> <translation>Названия дайвкомпьютеров</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>Добавить погружение</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation>Редактировать погружение</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation>Копировать параметры погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation>Вставить параметры погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>Авто-группировка</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>Профиль</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>Информация</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>Все</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation>Пред. компьютер</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation>След. компьютер</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>О Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation>Руководство пользователя</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>Планировщик</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>Импорт журналов</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>Импортировать журнал погружений из другой программы</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>Импорт с сайта divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>Полный экран</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>Переключить полноэкранный режим</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation>Проверить обновления</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>Экспорт</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation>Экспорт </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation>Настройки дайв-компьютера</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation>Редактировать в планировщике</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation>График pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation>График pN₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>График pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation>Потолок компьютера</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation>Расчетный потолок</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation>Расчет всех тканей</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>3м шаг для расчетного потолка</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>Пульс</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation>NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation>Рулетка</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation>Альтернативный масштаб</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation>Фотографии</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> - <translation>Замена смесей</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation>Фильтр погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation>Насыщение тканей</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation>Опрос пользователей</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>Отменить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>Повторить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation>Найти перемещенные фото</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation>Открыть облачное хранилище</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation>Сохранить в облаке</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation>Управление дайв-сайтами</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation>Редактирование дайв-сайта</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation>Подключить облачное хранилище</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Подключиться к</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Отключиться от</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Сохраните или отмените изменения перед открытием нового файла.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Сканировать директории с фото</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Сканировать</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>Поиск изображений, подождите...</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -4707,105 +4752,221 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Сохраните или отмените изменения перед закрытием файла.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Сохраните или отмените изменения перед добавлением погружения.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Печать плана погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Попытка редактирования погружения, созданного не вручную.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>CSV</source> + <translation>CSV</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Хотите ли вы сохранить изменения, внесенные в файл %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Хотите ли вы сохранить изменения, внесенные в файл журнала?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[локальный кэш для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[облачное хранилище для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>Журнал создан в старой версии</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Вы открыли журнал, созданный в старой версии Subsurface. Мы рекомендуем прочитать руководство, чтобы узнать о последних изменения, особенно что касается управления сайтами погружений. Subsurface попытался перенести уже существующие данные, но тем не менее стоит проверить, что все информация выглядит корректно.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation>Файлы погружений (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Файлы Cochran (*.can *.CAN);;Файлы CSV (*.csv *.CSV);;Файлы DiveLog.de (*.dld *.DLD);;Файлы JDiveLog (*.jlb *.JLB);;Файлы Liquivision (*.lvd *.LVD);;Файлы MkVI (*.txt *.TXT);;Файлы Suunto (*.sde *.db *.SDE *.DB);;Файлы Divesoft (*.dlf *.DLF);;Файлы UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;Файлы XML (*.xml *.XML);;APD log viewer (*.apd *.APD);;Файлы Datatrak/WLog (*.log *.LOG);;Файлы OSTCtools (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Все файлы (*)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>Соединение с облачным сервисом...</translation> </message> @@ -4813,7 +4974,7 @@ Subsurface попытался перенести уже существующие <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4821,22 +4982,22 @@ Subsurface попытался перенести уже существующие <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4844,7 +5005,7 @@ Subsurface попытался перенести уже существующие <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4896,8 +5057,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> - <translation>Файлы прошивки (*.hex *.bin)</translation> + <source>Firmware files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4921,89 +5082,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Открытый цикл</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>фут/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Последняя остановка на 20фт</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% ср. глубины - 20фут</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20фут - поверхность</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>м/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Последняя остановка на 6м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% ср. глубины - 6м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6м - поверхность</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>куб.фут/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>л/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>бар</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -5117,8 +5278,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5332,33 +5493,33 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Формат даты</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation><html><head/><body><p>Формат даты. Часто используемые описатели</p><p>d (день месяца)</p><p>ddd (день недели)</p><p>M (номер месяца)</p><p>MMM (назв. месяца)</p><p>yy/yyyy (2/4-циферный номер года)</p></body></html></translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation>Из настроек языка интерфейса</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation>Используется там, где не хватает места для длинного формата даты</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation>Short format</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation>Формат времени</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation><html><head/><body><p>Формат времени</p><p>Часто используемые описатели</p><p>h (часы в 12-часовом формате)</p><p>H (часы в 24-часовом формате)</p><p>mm (минуты)</p><p>ss (секунды)</p><p>t/tt (a/p или am/pm)</p></body></html></translation> </message> @@ -5368,30 +5529,38 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Язык</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation>Необходим перезапуск</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Для смены языка необходимо перезапустить Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation>Специальные символы</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> - <translation>Неизвестные символы в формате времени. -будут отображаться как есть. Возможно это не то, чего вы хотели. -См. http://doc.qt.io/qt-5/qdatetime.html#toString</translation> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5801,45 +5970,70 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and cannot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>Импорт шаблона печати</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> - <translation>HTML файлы (*.html)</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>Экспорт шаблона печати</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation>Это действие не может быть отменено!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>Удалить шаблон: %1?</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation type="unfinished"/> </message> </context> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (#%1 из %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Неизвестный дайвкомпьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Отображение NDL/TTS отключено из-за большого времени расчета</translation> </message> @@ -5849,22 +6043,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Добавить замену газа</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation> (Баллон %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Сделать первым дайв-компьютером</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> @@ -5874,6 +6063,11 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Удалить этот дайв-компьютер</translation> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation> (баллон %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Добавить изменение сетпойнта</translation> @@ -5906,8 +6100,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> - <translation>Скорректировать давление баллона %1 (текущее интерполированное %2)</translation> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> @@ -5953,147 +6147,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation>Запуск...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation>работа без облачного хранилища</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation>нет учетных данных для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation>Укажите правильные учетные данные для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Адрес почты и пароль для могут содержать только буквы, цифры и '.', '-', '_', и '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Попытка открыть облачное хранилище с новыми учетными данными</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation>Проверка учетных данных</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation>Нет ответа от сервера в облаке чтобы проверить учетные данные</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Невозможно подключиться к облачному хранилищу - учетная запись не проверена</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation>Учетные данные неверны</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Невозможно открыть облачное хранилище: Ошибка защищенного подключения</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation>Невозможно открыть облачное хранилище: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation>Невозможно подключиться к облачному хранилищу</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation>Ошибка облачного хранилища: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Ошибка подключения к серверу в облаке, работа в обычном режиме</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Облачное хранилище открыто. Погружения отсутствуют.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> <translation>ч</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation>с</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> <translation>Неизвестное местоположение GPS</translation> </message> @@ -6191,7 +6385,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>мин</translation> </message> @@ -6199,7 +6393,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation>ч</translation> </message> @@ -6207,7 +6401,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation>с</translation> </message> @@ -6534,7 +6728,7 @@ Not all images have timestamps in the range between </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> + <source>Image files</source> <translation type="unfinished"/> </message> <message> @@ -6648,8 +6842,8 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> - <translation>Журнал сообщений (ошибки, предупреждения)</translation> + <source>Import messages (errors, warnings, etc)</source> + <translation type="unfinished"/> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/> @@ -6658,81 +6852,87 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> - <translation>Файлы SmartTrak (*.slg *.SLG);;Все файлы (*)</translation> + <source>SmartTrak files</source> + <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> - <translation>Открыть файлы Subsurface</translation> + <source>All files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> - <translation>Файлы Subsurface (*.ssrf *SSRF *.xml *.XML);;Все файлы (*)</translation> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> + <translation>Открыть файлы Subsurface</translation> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation>Средняя</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation>Дата погружения: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation>Длительность: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>ч</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>мин</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation>Местоположение: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation>Партнер: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation>Дайвмастер: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation> @@ -6927,7 +7127,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation>Костюм не указан</translation> </message> @@ -7053,32 +7253,32 @@ Files with inappropriate date/time</source> <translation>Фотографии</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Загрузить фото из файлов</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Загрузить фото из Web</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>Удалить выбранные изображения?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>Удалить все изображения</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>Удаление изображений</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>Удалить все изображения?</translation> </message> @@ -7256,7 +7456,7 @@ mixed from Air and using: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>Без меток</translation> </message> @@ -7660,24 +7860,24 @@ mixed from Air and using: <translation>Сервер вернул следующую информацию:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Каждый две недели Subsurface проверяет наличие новой версии. Если вы не хотите проверять обновления, нажмите "Отказываюсь".</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Отказаться</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Принять</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Автоматическая проверка обновлений</translation> </message> @@ -7939,8 +8139,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation>Без ошибок</translation> </message> @@ -8064,21 +8264,12 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation>Ошибка разбора заголовка</translation> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8409,8 +8600,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>кислород</translation> </message> @@ -8495,15 +8686,10 @@ Maximum</source> <translation>кг</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> - <source>(%s) or (%s)</source> - <translation>(%s) или (%s)</translation> - </message> - <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>воздух</translation> </message> @@ -8513,27 +8699,27 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>интегрированный</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>пояс</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>груз на ноги</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation>спинка</translation> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>карабины</translation> </message> @@ -8716,23 +8902,23 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Ошибка подключения к облачному хранилищу Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation>Клонирование git-репозитория %s не удалось (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>неизвестно</translation> @@ -8874,75 +9060,75 @@ Maximum</source> <translation>Ошибка разбора смеси</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Невозможно создать анализатор для %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Ошибка регистрации данных</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Ошибка разбора выборки</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Событие: ожидание действия пользователя</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Ошибка регистрации обработчика событий.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Ошибка регистрации обработчика завершения.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Ошибка импорта данных погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Невозможно создать контекст libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Невозможно открыть %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>множественные GPS координаты для дайв-сайта, также %s @@ -8950,19 +9136,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation>другое название дайв-сайта: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -8978,19 +9164,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Ошибка %s в погружении %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation>Странное значение процентов %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation>Ошибка разбора '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation>Невозможно открыть файл преобразования %s</translation> </message> @@ -9009,8 +9195,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation>Внимание:</translation> </message> @@ -9036,16 +9222,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Бюльман</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Рантайм: %dмин<br></div></translation> @@ -9148,6 +9324,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>SAC</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9170,6 +9361,16 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>план погружения</b> создан</translation> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Деко-модель: Bühlmann ZHL-16C с GFlow = %d%% и GFhigh = %d%%</translation> @@ -9215,22 +9416,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>мин. запас газа для подъема уже превышает начальное давление в баллоне</translation> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s из <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s в запланированном подъеме)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation>%.0f%s (%.0f%s в запланированном подъеме) из <span style='color: red;'><b>%s</b></span></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <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="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>Низкое значение pO₂ %.2f в %d:%02u на смеси %s на глубине %.*f %s</translation> </message> @@ -9240,12 +9436,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Невозможно найти газ %s</translation> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9254,251 +9450,257 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation>Т: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation>С: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/мин </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fбар </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fбар </translation> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fбар </translation> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation>Деко: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Ост. без-ти: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1427"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Ост. без-ти: неизв. время @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Деко: неиз. время @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation>В деко </translation> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation>NDL: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>TTS: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Деко: %uмин @ %.0f%s (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation>В деко (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation>NDL: %uмин (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2ч (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>TTS: %uмин (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2ч (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation>RBT: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation>Расчетный потолок %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Ткань %.0fмин: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation>пульс: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation>азимут: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation>средная глубина здесь %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation>%s %sГ:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation>%s %sГ:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation>%s%sС:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation>%s %sС:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation>%s %sД:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation>%s SAC: %.*f%s</translation> </message> @@ -10363,22 +10565,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Город</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1237"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> @@ -10391,117 +10593,117 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Мобильный Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation>Настройки</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation>Добавить погружение вручную</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>Ручная синхронизация с облаком</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation>Режим "Без Интернета"</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation>Включить синхронизацию с облаком</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation>Справка</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation>Выгрузить данные GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Загрузить данные GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation>Показать точки GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation>Очистить кэш GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation>Разработчик</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation>Журнал приложения</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation>Тема оформления</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation>О программе</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation>Запустить службу позиционирования</translation> </message> @@ -10604,51 +10806,56 @@ p, li { white-space: pre-wrap; } <translation>Планирование</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation>Алгоритм VPM-B</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation>Алгоритм Бюльмана</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation>Газовый резерв</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>бар</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation>Отложить замену газа если остановка не требуется</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation>Переключение на необх. остановках</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation>Перерывы на основной газ</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>мин</translation> </message> @@ -10668,153 +10875,153 @@ p, li { white-space: pre-wrap; } <translation>Рекреационный режим</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation>Падение к первой глубине</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> - <translation>Мин. время переключения</translation> - </message> - <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> <source>Safety stop</source> <translation>Остановка безопасности</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> <source>Conservatism level</source> <translation>Уровень консерватизма</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> + <translation>Режим</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation>Газы</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation>л/мин</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation>Коэф. SAC</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation>Используется для расчета мин. газа. Два дайвера с высоким SAC в случае потери газа.</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation>Время решения проблемы</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation>Используется для расчета мин. газа. Доп. время на макс. глубине в случае потери газа.</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation>Используется для расчета лучшей смеси. Укажите глубину лучшей смеси в таблице доступных газов, указав глубину и букву "B" (лучший тримикс) или "BN" (лучший найтрокс)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>SAC на дне</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation>pO₂ на дне</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation>END лучшей смеси</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Примечания</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>Показывать время отсчета для остановок (абсолютное время)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation>Показать отсчет</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>Показывать длительность остановок (относительное время)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation>Показать время сегмента</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>Показывать переходы в списке или неявно учитывать их</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation>Показать переходы в деко</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation>Подробный план:</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation>pO₂ на деко</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation>SAC на деко</translation> </message> diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts index 82f2362f6..a0d664729 100644 --- a/translations/subsurface_sk_SK.ts +++ b/translations/subsurface_sk_SK.ts @@ -43,66 +43,86 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Uložiť</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Koniec</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation type="unfinished"/> @@ -113,22 +133,22 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation type="unfinished"/> </message> @@ -160,22 +180,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation type="unfinished"/> </message> @@ -185,113 +205,113 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -312,7 +332,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>Žiaden partner</translation> </message> @@ -1632,84 +1652,84 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Nastavenie záložného počítača</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> - <translation>Záložné súbory (*.xml)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>Chyba XML zálohy</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>Chyba počas ukladania zálohy. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Vytvorenie zálohy úspešné</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>Nastavenie bolo uložené do: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Obnova nastavenia počítača</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>Chyba XML obnovy</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Pri obnove zálohy nastala chyba. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>Úspešná obnova</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>Nastavenia boli obnovené úspešne.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Vyber súbor s firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> - <translation>Všetky súbory (*.*)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> - <translation>Log súbory</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1789,27 +1809,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>Kliknutím sem vymažeš fľašu</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Táto zmes sa používa. Len fľaše, ktoré nie sú použité pri ponore, môžu byť vymazané.</translation> </message> @@ -1923,27 +1943,27 @@ vybraný počítač?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Zmazať ponor</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -1951,103 +1971,103 @@ vybraný počítač?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Dátum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Miesto:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Hĺbka:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Trvanie:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Teplota vzduchu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Teplota vody:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Oblek:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Závažie:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Hodnotenie:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Poznámky:</translation> </message> @@ -2123,23 +2143,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation>začiatok</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation>koniec</translation> @@ -2304,12 +2324,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -2554,76 +2574,76 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Exportovať UDDF súbor ako</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>UDDF súbory (*.uddf *.UDDF)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <source>UDDF files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> - <translation>Exportovať CSV súbor ako</translation> + <source>CSV files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>CSV súbory (*.csv *.CSV)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <source>HTML files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> - <translation>Exportovať mapu sveta</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>HTML súbory (*.html)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>TeX files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> - <translation>Exportovať </translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <source>Export CSV file as</source> + <translation>Exportovať CSV súbor ako</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <source>Export world map</source> + <translation>Exportovať mapu sveta</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>XML súbory (*.xml *.ssrf)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <source>Export Subsurface XML</source> + <translation>Exportovať </translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Exportovať HTML súbor ako</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Neviem otvoriť súbor %s</translation> </message> @@ -2918,7 +2938,7 @@ GPS location:</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -2964,41 +2984,61 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>neznámy</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Cieľová hĺbka</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Aktuálny čas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Dĺžka (min)</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Použitá zmes</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3031,107 +3071,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Hĺbka</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Čas</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Tlak</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Teplota</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Farba</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Tlak S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Tlak I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Strop</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>Spotreba plynu</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Okolitý tlak</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation type="unfinished"/> </message> @@ -3447,71 +3487,71 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Stiahnutie</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Hladať Uemis DC</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> - <translation>Log súbory</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Upozornenie</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Uloženie dump súboru pre libdivecomputer spôsobí nenahratie ponorov do zoznamu ponorov.</translation> </message> - <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> - <translation>Dump súbory</translation> - </message> </context> <context> <name>DownloadFromDiveComputer</name> @@ -3580,7 +3620,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Stiahnutie</translation> </message> @@ -3606,7 +3646,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Zrušiť</translation> </message> @@ -3636,37 +3676,37 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Skús znovu</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Koniec</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Akceptovať</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Vybrať všetky</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3697,12 +3737,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3896,7 +3936,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3953,6 +3993,11 @@ p, li { white-space: pre-wrap; } <source>Country</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> + <translation type="unfinished"/> + </message> </context> <context> <name>LocationInformationModel</name> @@ -3976,28 +4021,28 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4015,8 +4060,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>Poznámky</translation> </message> @@ -4037,19 +4082,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>Teplota vzduchu</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>Teplota vody</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>Miesto</translation> </message> @@ -4114,123 +4159,123 @@ p, li { white-space: pre-wrap; } <translation>Dĺžka (min)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>Informácie</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation>Štatistika</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>Fotografie</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation>Vymazať zmeny</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>Fľaše</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation>Pridaj fľašu</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>Závažia</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation>Pridať závažia</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation>OC</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>Teplota vzduchu [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>Teplota vody [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>Táto akcia je editovaná.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>Viaceré ponory sú editované.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>Tento ponor sa edituje.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>Poznámky</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>Lokalita</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>Vymazať zmeny?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation>Chystáš sa vymazať zmeny.</translation> </message> @@ -4243,451 +4288,451 @@ p, li { white-space: pre-wrap; } <translation>&Súbor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>&Náhľad</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>&Help</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>&Import</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>&Nový logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>Nový</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>&Otvoriť logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>Otvor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>&Uložiť</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>Uložiť</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>Uložiť a&ko</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>Uložiť ako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>&Zatvoriť</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>Zatvoriť</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>&Tlačiť</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>Na&stavenia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>&Ukončiť</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>Import z &počítača</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>Import &GPS data zo Subsurface webu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>&Pridanie ponoru</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation>&Kopírovať údaje z ponoru</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation>&Vložiť údaje z ponoru</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>&Prečisluj</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>&Automatické zoskupovanie</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>&Ročné štatistiky</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>Zoznam &ponorov</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>&Všetko</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation>P&redchádzajúci DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation>&Nasledujúci DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>&O Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation>Uživateľský &manuál</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>P&lánovanie ponoru</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>Import z &log súborov</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>Import log súborov z iných aplikácii</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>Import z &</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>&Celá obrazovka</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>Prepnúť celú obrazovku</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation>&Kontrola novšej verzie</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>&Export</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation>Exportovať všetko</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation>Konfigurácia počítača</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation>Prepnúť pO₂ graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation>Prepnúť pN₂ graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>Prepnúť pHe graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation>Prepnúť zobrazenie stropu podľa počítača</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation>Prepnúť na vypočítaný strop</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation>Prepnúť výpočet všetkých tkanív</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Prepnúť na </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>Prepnúť tepovú frekvenciu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>Prepnúť MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>Prepnúť </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation>Prepnúť NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation>Prepnúť SAC spotrebu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation>Prepnúť pravítko</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation>Prepnúť fotografie</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation>&Filtruj zoznam ponorov</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>Otvoriť súbor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Zrušiť</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Upozornenie</translation> </message> @@ -4697,104 +4742,220 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Vytlačiť runtime tabuľku</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Ročná štatistika</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>CSV</source> + <translation>CSV</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <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="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Uložiť zmeny?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <source>Changes will be lost if you don't save them.</source> <translation>Zmeny budu stratené ak ich neuložíš.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Uložiť súbor ako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML súbory (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Otvoriť log súbor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4802,7 +4963,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4810,22 +4971,22 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4833,7 +4994,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4883,7 +5044,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> + <source>Firmware files</source> <translation type="unfinished"/> </message> </context> @@ -4908,89 +5069,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Posledná zastávka v 20 stopách</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% priemernej hĺbky do 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20ft na hladinu</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Posledná zastávka v 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% priemernej hĺbky do 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6m na povrch</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -5104,8 +5265,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML súbory (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5319,33 +5480,33 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Formát dátumu</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation>Formát času</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation type="unfinished"/> </message> @@ -5355,27 +5516,37 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Jazyk</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation>Potrebný reštart</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Na korektné nahratie nového jazyka je potrebné reštartovať Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> <translation type="unfinished"/> </message> </context> @@ -5786,45 +5957,70 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> - <source>Import template file</source> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> - <translation>HTML súbory (*.html)</translation> + <source>The template '%1' is read-only and cannot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> + <source>Import template file</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> <translation type="unfinished"/> </message> </context> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (#%1 z %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> @@ -5834,22 +6030,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Pridaj zmenu zmesi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation> (Fľaša %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> @@ -5859,6 +6050,11 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> @@ -5891,7 +6087,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> @@ -5938,147 +6134,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6176,7 +6372,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6184,7 +6380,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation type="unfinished"/> </message> @@ -6192,7 +6388,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation type="unfinished"/> </message> @@ -6517,7 +6713,7 @@ Not all images have timestamps in the range between </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> + <source>Image files</source> <translation type="unfinished"/> </message> <message> @@ -6631,7 +6827,7 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> + <source>Import messages (errors, warnings, etc)</source> <translation type="unfinished"/> </message> <message> @@ -6641,76 +6837,82 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> + <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> <translation type="unfinished"/> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation>Stredný</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation type="unfinished"/> @@ -6904,7 +7106,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7030,32 +7232,32 @@ Files with inappropriate date/time</source> <translation>Fotografie</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation type="unfinished"/> </message> @@ -7233,7 +7435,7 @@ vytvorene zo vzduchu a: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>Žiadne značky</translation> </message> @@ -7637,23 +7839,23 @@ vytvorene zo vzduchu a: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Akceptovať</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation type="unfinished"/> </message> @@ -7912,8 +8114,8 @@ Jazyk: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8034,21 +8236,12 @@ Maximum</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8379,8 +8572,8 @@ Maximum</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>kyslík</translation> </message> @@ -8465,15 +8658,10 @@ Maximum</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> - <source>(%s) or (%s)</source> - <translation>(%s) alebo (%s)</translation> - </message> - <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>vzduch</translation> </message> @@ -8483,27 +8671,27 @@ Maximum</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>integrované</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>opasok</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>členok</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8686,23 +8874,23 @@ Maximum</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>neznámy</translation> @@ -8844,93 +9032,93 @@ Maximum</translation> <translation>Chyba spracovania zmesi plynu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Nie je možné spracovať %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Chyba registrácie dát</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Chyba spracovania vzoriek</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Udalosť: Čakanie na vstup uživateľa</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Chyba registrácia správcu udalosti.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Chyba registrácie správcu ukončenia</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Chyba importu dát</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Problém inicializácie libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Nie je možné otvoriť %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -8946,19 +9134,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation>Zvláštne percenta v %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation>Chyba pri spracovaní '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation>Neviem otvoriť šablónu %s</translation> </message> @@ -8977,8 +9165,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation>Upozornenie:</translation> </message> @@ -9004,16 +9192,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation type="unfinished"/> @@ -9122,6 +9300,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Spotreba plynu</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9144,6 +9337,16 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> @@ -9189,22 +9392,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <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="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> @@ -9214,12 +9412,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Neviem nájsť zmes %s</translation> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9228,243 +9426,249 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1427"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation>V deco (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation>Vypočítaný strop %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Tkanivo %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation>smer: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation type="unfinished"/> </message> @@ -10324,22 +10528,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1237"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> @@ -10352,117 +10556,117 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation>Nastavenia</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation>Pomoc</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation type="unfinished"/> </message> @@ -10565,51 +10769,56 @@ p, li { white-space: pre-wrap; } <translation>Plánovanie</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation>Plánovanie back gas zastávok</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>min</translation> </message> @@ -10629,153 +10838,153 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation>Priamy zostup do prvej hĺbky</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> <source>Safety stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> <source>Conservatism level</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> <source>+</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> + <translation>Mód ponoru</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation>Nastavenia zmesi</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>SAC na dne</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation>pO₂ na dne</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Poznámky</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>Zobraziť runtime zastávok (absolútny čas) v pláne ponoru</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation>Zobraziť priebeh</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>V pláne ponoru zobraziť trvanie (relatívny čas) zastávok</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation>Zobraziť trvanie segmentu</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>Zobraziť prechody v pláne ponoru alebo ich predpokladať implicitne</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation>Zobraziť prechody medzi deco zastávkami</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation>Ukecaný plán ponoru</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation>pO₂ pri dekompresii</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation>SAC pri dekompresii</translation> </message> diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts index ac7743008..e13cd2b11 100644 --- a/translations/subsurface_sv_SE.ts +++ b/translations/subsurface_sv_SE.ts @@ -47,66 +47,86 @@ <translation>Val av Blåtandsenhet</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Upptäckta enheter</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Spara</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Avsluta</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Sök</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Rensa</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Inställningar för blåtandshenheten i den här ändan</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Namn</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Adress:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Blåtand påslaget</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Slå av/på</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Välj enhet:</translation> @@ -117,22 +137,22 @@ <translation>Namn:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation>Kunde inte initialisera Winsock version 2.2</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation>Försöker slå på den lokala Blåtands enheten...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation>Försöker slå av den lokala Blåtands enheten...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation>Listan av fjärrenheter rensades.</translation> </message> @@ -164,22 +184,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation>Ej Parkopplad</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation>Parkopplad</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation>IHOPPARNING_GODKÄND</translation> </message> @@ -189,113 +209,113 @@ <translation>%1 (%2) [Status: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Enheten %1 kan nu användas för anslutningar. Du kan klicka på spara.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Enheten %1 måste parkopplas för att kunna användas. Du kan använda kontextmenyn för parkopplingsmöjligheter.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation>Enheten behöver en icke-noll adress för anslutning.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation>Den lokala enheten uppdaterades.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation>Parkoppla</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation>Ta bort parkoppling.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation>Försök att parkoppla med %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation>Försöker ta bort parkopplingen med %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation>Parkopplingen med %1 togs bort.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation>Parkopplade med %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation>Enheten %1 parkopplades och är nu auktoriserad.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Enheten %1 kan nu användas för anslutningar. Du kan klicka på spara.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation>Fel i lokal enhet: %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Parnings fel. Om enheten kräver en speciell PIN kod, vänligen försök para enheterna via operativsystemet.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation>Okänt fel</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Blåtandsadaptern är avslagen, slå på den innan sökning.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Skriva till eller läsa från enheten resulterade i ett fel.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation>Ett okänt fel har uppstått.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation>Enhets upptäcknings fel. %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>Inte tillgänglig</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Den lokala blåtands adaptern kan inte nås.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Enhets söknings agenten skapades inte därför att adressen %1 stämmer inte med den fysiska adapteradressen för någon lokal blåtandsenhet.</translation> </message> @@ -316,7 +336,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>Inga parkamrater</translation> </message> @@ -359,7 +379,7 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> <source>Register</source> - <translation type="unfinished"/> + <translation>Registrera</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> @@ -1636,84 +1656,84 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Säkerhetskopiera dykdatorns inställningar</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> - <translation>Backupfiler (*.xml)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> + <translation>Backupfiler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>XML backup fel</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>Ett fel inträffade när backupfilen skulle sparas. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Backup sparad</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>Dina inställningar har blivit sparade till: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Återställ dykdatorns inställningar</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>XML återställningsfel</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Ett fel inträffade när backupfilen skulle återställas. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>Återställda</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>Dina inställningar har blivit återställda</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Välj en firmware-fil</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> - <translation>Alla filer (*.*)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> + <translation>Alla filer</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> - <translation>Välj fil som loggfil för nerladdningen ifrån dykdatorn</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> + <translation>Loggfiler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> - <translation>Loggfiler (*.log)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> + <translation>Välj fil som loggfil för nerladdningen ifrån dykdatorn</translation> </message> </context> <context> @@ -1793,27 +1813,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>Klicka här för att ta bort denna flaska</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Bytes djup för deko gas. Beräknad med deko pO₂ inställning, om inte satt manuellt.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Denna gas används. Bara flaskor som inte används kan tas bort.</translation> </message> @@ -1927,27 +1947,27 @@ radera den valda dykdatorn?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation>Dykdetaljer</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Radera dyk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> - <translation type="unfinished"/> + <translation>Avbryt redigering</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation>Visa på kartan</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation>Flera kamrater</translation> </message> @@ -1955,104 +1975,104 @@ radera den valda dykdatorn?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation>Dyk %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Datum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Plats:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation>Koordinater:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation>Använd nuvarande GPS position:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Djup:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Varaktighet:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Lufttemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Vattentemperatur:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Dräkt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Parkamrat:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Vikt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation>Flaska:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation>Gasblandning:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation>Starttryck:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation>Sluttryck:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Ranking:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> - <translation type="unfinished"/> + <translation>Sikt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Anteckningar:</translation> </message> @@ -2097,7 +2117,7 @@ GPS position:</translation> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> - <translation type="unfinished"/> + <translation>Sikt:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> @@ -2128,23 +2148,23 @@ GPS position:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation>(cyl. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>Manuellt byte till OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation>start</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation>slut</translation> @@ -2309,12 +2329,12 @@ GPS position:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Skapa en ny dykplats, kopiera relevant information från detta dyk.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation>Skapa en ny dykplats med detta namn</translation> </message> @@ -2559,76 +2579,76 @@ GPS position:</translation> <translation>Skriv dyk dyk som TeX macro till fil.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Exportera som UDDF fil</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>UDDF filer (*.uddf *.UDDF)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <source>UDDF files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> - <translation>Exportera CSV-fil som</translation> + <source>CSV files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>CSV filer (*.csv *.CSV)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <source>HTML files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> - <translation>Exportera världskarta</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>HTMLfiler (*.html)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>TeX files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> - <translation>Exportera Subsurface XML</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <source>Export CSV file as</source> + <translation>Exportera CSV-fil som</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>XML filer (*.xml *.ssrf)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <source>Export world map</source> + <translation>Exportera världskarta</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <source>Export Subsurface XML</source> + <translation>Exportera Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Spara bildernas ljup</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Exportera till TeX fil</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> - <translation>TeX filer (*.tex)</translation> - </message> - <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Exportera HTML filer son</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Vänligen vänta, exporterar...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Kan inte öppna fil %s</translation> </message> @@ -2923,7 +2943,7 @@ GPS position:</translation> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation>Flera kamrater</translation> </message> @@ -2969,41 +2989,61 @@ GPS position:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>okänd</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Slutdjup</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Löptid</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Varaktighet</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Använd gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>Min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3036,107 +3076,107 @@ GPS position:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Djup</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Tryck</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Färg</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Användarinmatad</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Tryck S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Tryck I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Tak</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Omgivande tryck</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>Hjärtrytm</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>Gradientfaktor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>Medeldjup @ s</translation> </message> @@ -3456,71 +3496,71 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Ladda ned</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation>Välj Blåtands nerladdnings läge</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Hitta Uemis dykdator</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation>Avbryt nerladdning</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation>Välj fil som loggfil för nerladdningen ifrån dykdatorn</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> + <translation>Loggfiler</translation> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation>Välj fil för binär dumpning av nerladdningen ifrån dykdatorn</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> - <translation>Försök igen med nerladdningen</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> - <translation>Loggfiler (*.log)</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> + <translation>Försök igen med nerladdningen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Varning</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Att spara en libdivecomputer-dump kommer inte att ladda ner dyken till dyklistan.</translation> </message> - <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> - <translation>Dumpfiler (*.bin)</translation> - </message> </context> <context> <name>DownloadFromDiveComputer</name> @@ -3589,7 +3629,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Ladda ned</translation> </message> @@ -3615,7 +3655,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -3645,37 +3685,37 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Försök igen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Avsluta</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>Nerladdade dyk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Acceptera</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Markera Samtliga</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Avmarkera alla</translation> </message> @@ -3706,12 +3746,12 @@ p, li { white-space: pre-wrap; } <translation>Anslut till Facebook </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>För att koppla ner Subsurface från ditt Facebook-konto, använd 'Dela på' menyn.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Logga in för att koppla Subsurface till Facebook. Det tillgängliggör möjligheten att publicera dyk till din Facebook-timeline.</translation> </message> @@ -3770,7 +3810,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/filterwidget.ui" line="73"/> <source>Reset filters</source> - <translation>Ränsa filter</translation> + <translation>Rensa filter</translation> </message> <message> <location filename="../desktop-widgets/filterwidget.ui" line="87"/> @@ -3905,7 +3945,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation>Ingen plats angiven</translation> </message> @@ -3962,6 +4002,11 @@ p, li { white-space: pre-wrap; } <source>Country</source> <translation>Land</translation> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> + <translation type="unfinished"/> + </message> </context> <context> <name>LocationInformationModel</name> @@ -3985,29 +4030,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation>Dykplats administration</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> <translation>Sammanfoga med nuvarande plats</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> <translation>Sammanslår dykplatser</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation>Du är påväg att slå samman dykplatser, du kan inte ångra den ihopslagningen Är du säker att du vill fortsätta?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation>Du redigerar en dykplats</translation> </message> @@ -4025,8 +4070,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>Anteckningar</translation> </message> @@ -4047,19 +4092,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>Lufttemp</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>Vattentemperatur</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>Plats</translation> </message> @@ -4124,123 +4169,123 @@ p, li { white-space: pre-wrap; } <translation>Varaktighet</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation>Extra Info</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>Information</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation>Statistik</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>Bilder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation>Applicera förändringar</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation>Kasta förändringar</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>Flaskor</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation>Lägg till flaska</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>Vikter</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation>Lägg till viktsystem</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation>OC</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation>fridykning</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>Lufttemperatur [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>Vattentemperatur [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>Detta resmål håller på och ändras.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>Flera dyk håller på och ändras.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>Detta dyk håller på och ändras.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>Reseanteckningar</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>Resmål</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation>Ny dykplats</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>Kassera ändringarna?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation>Du är påväg att kasta bort dina förändringar</translation> </message> @@ -4253,451 +4298,451 @@ p, li { white-space: pre-wrap; } <translation>&File</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>&Logg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>&Visa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>&Hjälp</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>&Import</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation>&Redigera</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> <translation>Dela via</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>&Ny Loggbok</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>Ny</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>&Öppna loggbok</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>Öppna</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>&Spara</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>Spara</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>Spara som(&v)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>Spara som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>Stäng</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>Stäng</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>&Skriv ut</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>Inställninga&r</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>&Avsluta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>Ladda ner från dykdator</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importera &GPSdata från Subsurface webbtjänst</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> <translation>Ändra enhetsnamn</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>Lägg till dyk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation>&Redigera dyk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation>Kopiera dykkomponenter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation>Klistra in dykkomponenter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>&Renumrering</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>Autogruppering</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>&Årsstatistik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>Dyklista</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>&Alla</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation>Fö&regående dykdator</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation>&Nästa dykdator</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>Om Subsurface(&a)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation>Användar&manual</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>P&lanera dyk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>&Importera loggfiler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>Importera loggfiler ifrån andra applikationer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>Importera &från divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>&Fullskärm</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>Växla fullskärmsläge</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation>&Sök efter uppdateringar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>&Exportera</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation>Exportera dykloggar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation>Konfigurera &dykdatorer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation>Redigera &dyk i dykplaneraren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation>Växla pO₂ graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation>Växla pN₂ graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>Slå av/på pHe grafen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation>Slå av/på dykdatorrapporterat takinformation</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation>Slå av/på beräknad takinformation</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation>Slå av/på beräkningen av alla vävnader</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Slå av/på beräknad takinformation i 3m steg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>Slå av/på hjärtrytm</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>Slå av/på MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>Slå av/på EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation> Slå av/på NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation>Slå av/på SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation>Slå av/på mätverktyget</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation>Skala graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation>Växla bilder</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> - <translation>Växla flaskgrafen</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation>&Filtrera dyklista</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation>Växla färgdiagram för vävnader</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation>&Användarundersökning</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>&Ångra</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>&Gör om</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation>&Hitta flyttade bilder</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation>Öppna molnlagring</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation>Spara till molnlagring</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation>&Hanter dykplatser</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation>Dykplats redigering</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation>Gör molnlagring aktiv</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Anslut till</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Kopplan ner från</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>Öppna fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Traversera bild kataloger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Sök</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>Scannar bilder...(detta kan ta ett tag)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Varning</translation> </message> @@ -4707,105 +4752,221 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Skriv ut körtidstabell</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Försöker planera om ett dyk som inte är en dykplan.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Försöker ändra ett dyk som inte är ett manuellt inlagt dyk.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Årsstatistik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>CSV</source> + <translation>CSV</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <source>All files</source> + <translation>Alla filer</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <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="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Spara ändringar?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <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="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Spara fil som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[lokal cache för] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[molnlatgring för] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>Öppnar datafil från en äldre version</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Du öppnade en datafil från en äldre version av Subsurface. Vi rekommenderar att du läser manualen för att lära dig om förändringarna i den nya versionen, speciellt om dykplats administrationen som har ändrats signifikant. Subsurface har redan försökt att fylla i datat men det kan vara värt besväret att titta på den nya dykplats administrationen och se till att allt ser bra ut.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Öppna dyklogg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation>Dyklogg filer (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>Kontaktar molntjänst...</translation> </message> @@ -4813,7 +4974,7 @@ Subsurface har redan försökt att fylla i datat men det kan vara värt besväre <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4821,22 +4982,22 @@ Subsurface har redan försökt att fylla i datat men det kan vara värt besväre <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4844,7 +5005,7 @@ Subsurface har redan försökt att fylla i datat men det kan vara värt besväre <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4896,8 +5057,8 @@ On din enhet använder blåtand, gör samma förberedelser som för loggboks ner </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> - <translation>Firmware filer (*.hex *.bin)</translation> + <source>Firmware files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4921,89 +5082,89 @@ On din enhet använder blåtand, gör samma förberedelser som för loggboks ner <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Öppet system</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Sista stoppet på 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% av snittdjup till 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20ft till ytan</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Sista stoppet på 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% av snittdjup till 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6m till ytan</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -5117,8 +5278,8 @@ On din enhet använder blåtand, gör samma förberedelser som för loggboks ner </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5332,33 +5493,33 @@ On din enhet använder blåtand, gör samma förberedelser som för loggboks ner <translation>Datumformat</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation><html><head/><body><p>Föredraget datum format. Vanliga använda fält är</p><p>d (dag i månad)</p><p>ddd (förkortat dag namn)</p><p>M (månads nummer)</p><p>MMM (förkortat månads namn)</p><p>yy/yyyy (2/4 siffrigt år)</p></body></html></translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation>Använd standard språket</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation>Detta används på platser där det inte är tillräckligt med plats att visa fullständigt datum</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation>Kort format</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation>Tidsformat</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation><html><head/><body><p>Föredraget datum format. Vanliga använda fält är</p><p>h (timmar i 12h format)</p><p>H (timmar i 24h format)</p><p>mm (2 siffriga minutes)</p><p>ss (2 siffriga seconds)</p><p>t/tt (a/p eller am/pm)</p></body></html></translation> </message> @@ -5368,30 +5529,38 @@ On din enhet använder blåtand, gör samma förberedelser som för loggboks ner <translation>Språk</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation>Omstart krävs</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>För att ladda nytt språk fullständigt måste Subsurface startas om.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation>Bokstavliga tecken</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> - <translation>Vanliga tecken i tidsformatet. -Dessa kommer att användas som de är. Det kanske inte är som du tänkt dig. -Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5801,45 +5970,70 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and cannot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>Importera mallfil</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> - <translation>HTMLfiler (*.html)</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>Exportera mallfil som</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation>Denna åtgärd kan inte ångras!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>Radera mall: %1?</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation type="unfinished"/> </message> </context> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (#%1 av %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Okänd dykdator</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Visa NDL / TTS stängdes av pga att det tog för lång tid att beräkna</translation> </message> @@ -5849,22 +6043,17 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Lägg till gasbyte</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation> (Flaska %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Gör till första dykdator</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation>Planera dyk</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation>Manuellt tillagt dyk</translation> </message> @@ -5874,6 +6063,11 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Ta bort denna dykdator</translation> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation>(cyl. %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Lägg till setpoint byte</translation> @@ -5906,8 +6100,8 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> - <translation>Förändra trycket i flaska %1 (nu beräknat till %2)</translation> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> @@ -5953,147 +6147,147 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation>Startar...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation>Arbetar i molnfritt läge</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation>inga moln referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation>Vänligen ange giltiga moln referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Molnlagrings email och lösenord kan bara beså av bokstäver, siffror samt '.', '-', '_' och '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Försöker öppna moln lagring med nya referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation>Testar moln referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation>Inget svar från molnservern för verifiering av referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Kan inte ansluta till moln lagring - molnkonto inte verifierat</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation>Moln referenser är ogiltiga</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Kan inte öppna moln lagring: Gick inte skapa https koppling</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation>Kan inte öppna molnlagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation>Kan inte ansluta till moln lagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation>Molnlagrings fel: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Misslyckades ansluta till moln server, återgår till molnfri status</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Molnlagring öppnades framgångsrikt. Inga dyk i dyklistan</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>Min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> <translation>Okänd GPS position</translation> </message> @@ -6191,7 +6385,7 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>Min</translation> </message> @@ -6199,7 +6393,7 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation>h</translation> </message> @@ -6207,7 +6401,7 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation>sek</translation> </message> @@ -6534,7 +6728,7 @@ Alla bilder har inte en tidstämpel mellan </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> + <source>Image files</source> <translation type="unfinished"/> </message> <message> @@ -6648,8 +6842,8 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> - <translation>Importera meddelanden (Felmedelanden, varningar etc)</translation> + <source>Import messages (errors, warnings, etc)</source> + <translation type="unfinished"/> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/> @@ -6658,81 +6852,87 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> - <translation>SmartTrak filer (*.slg *.SLG);;All files (*)</translation> + <source>SmartTrak files</source> + <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> - <translation>Öppna Subsurface filer</translation> + <source>All files</source> + <translation>Alla filer</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> - <translation>Subsurface filer (*.ssrf *SSRF *.xml *.XML);;All files (*)</translation> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> + <translation>Öppna Subsurface filer</translation> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation>Medium</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation>Dykdatum: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation>Varaktighet: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>Min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation>Dykplats: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation>Parkamrat: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation> @@ -6927,7 +7127,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation>Ingen dräkt vald</translation> </message> @@ -7053,32 +7253,32 @@ Files with inappropriate date/time</source> <translation>Bilder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Laddar bild(er) från fil(er)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Ladda bild(er) från nätet</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>Radera valda bilder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>Radera alla bilder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>Raderar bilder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>Är du säker på att du vill radera alla bilder?</translation> </message> @@ -7256,7 +7456,7 @@ mixas av luft och: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>Toma taggar</translation> </message> @@ -7660,24 +7860,24 @@ mixas av luft och: <translation>Servern returnerade följande information:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface kollar varannan vecka om det har kommit en ny version. Om du inte vill att Subsurface skall göra det, vänligen klicka på Avslå</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Avslå</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Acceptera</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Sök efter uppdateringar automatiskt</translation> </message> @@ -7938,8 +8138,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation>Inget fel</translation> </message> @@ -8060,21 +8260,12 @@ Medel</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation>Misslyckades läsa sidhuvudet</translation> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8405,8 +8596,8 @@ Medel</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>oxygen</translation> </message> @@ -8491,15 +8682,10 @@ Medel</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> - <source>(%s) or (%s)</source> - <translation>(%s) eller (%s)</translation> - </message> - <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>luft</translation> </message> @@ -8509,27 +8695,27 @@ Medel</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>integrerat</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>bälte</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>ankel</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation>Ryggplatta</translation> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8712,23 +8898,23 @@ Medel</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Fel på uppkopplingen mot Subsurface molntjänst</translation> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation>git clone av %s misslyckades (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>okänd</translation> @@ -8870,75 +9056,75 @@ Medel</translation> <translation>Kunde inte tolka gasblandning</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Kan inte skapa parser för %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Kunde inte registrera parser-data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Kunde inte tolka sampel</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Händelse: väntar på användaren</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Kunde inte registrera event-funktion</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Kunde inte registrera avbrytningsrutin</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Lyckades inte importera dykdata</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Kan inte skapa libdivecomputer context</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Kunde inte öppna fil %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>multipla GPS positioner för denna dykplats; även %s @@ -8946,19 +9132,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation>alternativt namn för platsen: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -8974,19 +9160,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Fel - %s - vid läsning av dyk %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation>Konstig procent läsning %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation>Kunde inte läsa '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation>Kunde inte öppna formatmall %s</translation> </message> @@ -9005,8 +9191,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation>Varning:</translation> </message> @@ -9032,16 +9218,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Löptid: %dmin<br></div></translation> @@ -9144,6 +9320,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>SAC</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9166,6 +9357,16 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>dykplan</b> skapad på</translation> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> @@ -9211,22 +9412,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <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="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>lågt pO₂ värde %.2f vid %d:%02u med gas %s på djup %.*f %s</translation> </message> @@ -9236,12 +9432,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Kan inte hitta gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9250,249 +9446,255 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Säkerhetsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1427"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation>I Deko </translation> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation>I deko (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (beräknad) </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (beräknad) </translation> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation>Beräknat tak %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Vävnad %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation>hjärtrytm: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation>kurs: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation>medeldjup fram tills hit %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation>%s SAC: %.*f%s</translation> </message> @@ -10357,22 +10559,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Storstad</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation>Börja spara data</translation> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation>Börja spara dyk</translation> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1237"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> @@ -10385,117 +10587,117 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation>Dyklista</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation>Inställningar</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation>Lägg till dyk manuellt</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation>Ladda ner från dykdator</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>Manuellt synkronisera med molnet</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation>Ouppkopplat läge</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation>Aktivera automatisk molnsynkronisering</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation>Hjälp</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation>Ladda upp GPS data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Ladda ner GPS data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation>Visa GPS position</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation>Rensa GPS cache</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation>Utvecklare</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation>App logg</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation>Tema information</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation>Om</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation>Kör positions tjänst</translation> </message> @@ -10598,51 +10800,56 @@ p, li { white-space: pre-wrap; } <translation>Planering</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation>VPM-B</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation>Bühlmann deco</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation>Gasreserv</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation>Fördröj gasbyte om stopp ej krävs</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation>Byt bra vid obligatoriskt stopp</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation>Planera pauser på bakgas</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>Min</translation> </message> @@ -10662,153 +10869,153 @@ p, li { white-space: pre-wrap; } <translation>Sportdykar version</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation>Ner till första djup</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> - <translation>Min. bytes tid</translation> - </message> - <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> <source>Safety stop</source> <translation>säkerhetsstopp</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> <source>Conservatism level</source> <translation>Konservatism nivå</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> + <translation>Dykläge</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation>Gasval</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation>SAC faktor</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation>Problemlösnings tid</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation>Används för att beräkna bästa mix. Välj bästa mix djup i tabellen 'Tillgängliga gaser' genom att ange gas djup, följt av "B" (bästa trimix mix) eller "BN" (bästa nitrox mix)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>Botten SAC</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation>pO₂ under bottenfas</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation>Bästa mix END</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Anteckningar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>I dykplanen, visa körtid (absolut tid) av stop</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation>Visa körtid</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>I dykplanen, visa stopptid (relativ tid) av stop</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation>Visa stoppens tid</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>I dykplanen, visa förflyttningar eller hantera dem som implicita</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation>Visa byten av djup</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation>Utskriven dykplan</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation>pO₂ under deko</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation>Deko SAC</translation> </message> diff --git a/translations/subsurface_tr.ts b/translations/subsurface_tr.ts index 2a5f468c6..1f9350114 100644 --- a/translations/subsurface_tr.ts +++ b/translations/subsurface_tr.ts @@ -43,66 +43,86 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Kaydet</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation type="unfinished"/> @@ -113,22 +133,22 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation type="unfinished"/> </message> @@ -160,22 +180,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation type="unfinished"/> </message> @@ -185,113 +205,113 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -312,7 +332,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -374,11 +394,19 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> <source>Dive #</source> - <translation>Dalış #</translation> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -393,12 +421,12 @@ <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> <source>Duration</source> - <translation>Süre</translation> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> <source>Location</source> - <translation>Konum</translation> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1624,82 +1652,82 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> - <translation>Tüm dosyalar (*.*)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> - <translation>Kayıt dosyaları (*.log)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1779,27 +1807,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>Buraya tıklayarak bu tüp kaldırılır.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -1913,27 +1941,27 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -1941,103 +1969,103 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Tarih:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Konum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Süre:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Hava Sıcaklığı:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Su Sıcaklığı:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Divemaster(Dalış lideri):</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Değerlendirme:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Notlar:</translation> </message> @@ -2045,67 +2073,67 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Hava Sıcaklığı:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Su Sıcaklığı:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Değerlendirme:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Divemaster(Dalış lideri):</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Notlar</translation> </message> @@ -2113,23 +2141,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation>son</translation> @@ -2145,7 +2173,7 @@ GPS location:</source> <message> <location filename="../qt-models/diveimportedmodel.cpp" line="43"/> <source>Duration</source> - <translation>Süre</translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-models/diveimportedmodel.cpp" line="45"/> @@ -2167,23 +2195,23 @@ GPS location:</source> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation type="unfinished"/> </message> @@ -2191,102 +2219,102 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Hepsini aç</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Geziden dalış kaldır</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Dalış sil</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Seçili dalışları birleştir</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Dalışları yeniden numaralandır</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Görüntü dosyalarını aç</translation> </message> @@ -2294,12 +2322,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -2544,76 +2572,76 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>UDDF dosyası olarak dışarı aktar</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>UDDF dosyaları (*.uddf *.UDDF)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <source>UDDF files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> - <translation>CSV dosyası olarak dışarı aktar</translation> + <source>CSV files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>CSV dosyaları (*.csv *.CSV)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <source>HTML files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> - <translation>Dünya haritasını dışarı aktar</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>HTML dosyaları (*.html)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>TeX files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> - <translation>Subsurface XML dışa aktar</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <source>Export CSV file as</source> + <translation>CSV dosyası olarak dışarı aktar</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>XML dosyaları (*.xml *.ssrf)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <source>Export world map</source> + <translation>Dünya haritasını dışarı aktar</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> - <source>Save image depths</source> - <translation type="unfinished"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <source>Export Subsurface XML</source> + <translation>Subsurface XML dışa aktar</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>Export to TeX file</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> + <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>Export to TeX file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>HTML dosyası olarak dışarı aktar</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>%s dosyası açılamıyor</translation> </message> @@ -2908,7 +2936,7 @@ GPS location:</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -2954,35 +2982,61 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>bilinmeyen</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Final derinlik</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Çalışma süresi</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Süre</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Gaz kullanımı</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>dak</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>fit</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3015,112 +3069,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Derinlik</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Zaman</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Basınç</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Sıcaklık</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Renk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Kullanıcı girdisi</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Tüp indeksi</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Tavan</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Sensör 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Sensör 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Sensör 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation type="unfinished"/> </message> @@ -3353,81 +3402,81 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Bitti</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Dalış listesi yükleniyor ...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Dalış listesi indiriliyor ...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>%1 dalış indiriliyor...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>İndirme bitti- %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>İndirme bozuk</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Arşiv açılamadı: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Yükleme bitti</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Yükleme başarısız oldu</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Yükleme başarılı</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Giriş başarısız</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Hata: %1</translation> </message> @@ -3435,71 +3484,71 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>İndir</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Hata</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> - <translation>Kayıt dosyaları (*.log)</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Uyarı</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> - <translation type="unfinished"/> - </message> </context> <context> <name>DownloadFromDiveComputer</name> @@ -3568,7 +3617,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>İndir</translation> </message> @@ -3594,7 +3643,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>İptal</translation> </message> @@ -3609,52 +3658,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Yeniden dene</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Uygula</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Tümünü Seç</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3685,12 +3734,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3698,22 +3747,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3884,7 +3933,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3941,6 +3990,11 @@ p, li { white-space: pre-wrap; } <source>Country</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> + <translation type="unfinished"/> + </message> </context> <context> <name>LocationInformationModel</name> @@ -3964,28 +4018,28 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4003,8 +4057,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>Notlar</translation> </message> @@ -4025,19 +4079,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>Hava sıcaklığı.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>Su sıcaklığı.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>Konum</translation> </message> @@ -4102,123 +4156,123 @@ p, li { white-space: pre-wrap; } <translation>Süre</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>Bilgilendirme</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>Fotoğraflar</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>Tüpler</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation>Tüp ekle</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>Ağırlıklar</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>Hava sıcaklığı. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>Su sıcaklığı. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>Bu gezi düzenleniyor.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>Çoklu dalış düzenleniyor.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>Bu dalış düzenleniyor.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>Gezi notları</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>Gezi konumu</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>Değişiklikleri silinsin mi ?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -4231,446 +4285,451 @@ p, li { white-space: pre-wrap; } <translation>&Dosya</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>&Kayıt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>&Görünüm</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>&Yardım</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>&İçe Aktar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>&Yeni seyir defteri</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>Yeni</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>&Seyir defteri aç</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>Aç</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>&Kaydet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>Kaydet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>&Farklı kaydet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>Farklı kaydet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>&Kapat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>Kapat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>&Yazdır</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>&Tercihler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>&Çıkış</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>&Dalış bilgisayarından içe aktar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>&Subsurface web hizmetinden GPS verilerini içe aktar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>&Dalış ekle</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>&Yeniden numarala</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>&Otomatik grup</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>&Yıllık istatistikler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>&Dalış listesi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>&Bilgi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>&Tümü</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>&Subsurface Hakkında</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation>&Kullanıcı rehberi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>&Dalış planı</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>&Kayıt dosyalarını içe aktar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>Diğer uygulamalardan dalış kayıt dosyalarını içe aktar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>&divelogs.de'den içe aktar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>&Tam ekran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>Tam ekran geçişi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation>&Güncellemeler için denetle</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>&Dışa aktar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>pHe grafik değiştir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation>Hesaplanan tavanı değiştir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation>Tüm doku hesaplamalarını değiştir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>Kalp atış hızı geçişi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>MOD değiştir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>EHD, END, EHYD değiştir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation>NDL, YZ geçişi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation>Cetvel geçişi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>Dosya aç</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>İptal</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Uyarı</translation> </message> @@ -4680,104 +4739,220 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <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="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <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="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Yıllık istatistikler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>CSV</source> + <translation>CSV</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <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="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Değişiklikler kaydedilsin mi ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML dosyaları (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Dalış kayıt dosyasını aç</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4785,7 +4960,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4793,22 +4968,22 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4816,7 +4991,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4866,7 +5041,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> + <source>Firmware files</source> <translation type="unfinished"/> </message> </context> @@ -4891,89 +5066,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>fit/dak</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>20 fit son durak</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>Yüzeye 20 fit</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>fit</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/dak</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>6m son durak</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>yüzeye 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -5087,8 +5262,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML dosyaları (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5100,32 +5275,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> + <source>Dive site layout</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation type="unfinished"/> </message> @@ -5322,33 +5477,33 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Tarih biçimi</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation>Zaman biçimi</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation type="unfinished"/> </message> @@ -5358,27 +5513,37 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Lisan</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation>Yeniden başlatma gerekli</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Subsurface yeni bir dil yüklemek için yeniden başlatmanız gerekir.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> <translation type="unfinished"/> </message> </context> @@ -5427,7 +5592,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation type="unfinished"/> </message> @@ -5508,6 +5673,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5778,152 +5953,177 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and cannot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> - <source>HTML files (*.html)</source> - <translation>HTML dosyaları (*.html)</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> - <source>Delete template: %1?</source> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> <translation type="unfinished"/> </message> </context> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Gaz değişimi ekle</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> - <source> (Tank %1)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Yerimi ekle</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>OLay kaldır</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Benzer olayları gizle</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>İsmi düzenle</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Olayları gizle</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Seçili olayları kaldırılsın mı ?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Yeriminde ismi düzenle</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Özel isim:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>İsim çok uzun!</translation> </message> @@ -5931,147 +6131,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>dak</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6169,7 +6369,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>dak</translation> </message> @@ -6177,7 +6377,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation type="unfinished"/> </message> @@ -6185,7 +6385,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation type="unfinished"/> </message> @@ -6229,6 +6429,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Etiketler</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6500,7 +6710,7 @@ Not all images have timestamps in the range between </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> + <source>Image files</source> <translation type="unfinished"/> </message> <message> @@ -6614,7 +6824,7 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> + <source>Import messages (errors, warnings, etc)</source> <translation type="unfinished"/> </message> <message> @@ -6624,78 +6834,84 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> + <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> <translation type="unfinished"/> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation>Süre: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>dak</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation>Dalış konumu: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation> @@ -6788,12 +7004,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -6890,7 +7106,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7016,32 +7232,32 @@ Files with inappropriate date/time</source> <translation>Fotoğraflar</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation type="unfinished"/> </message> @@ -7217,7 +7433,7 @@ mixed from Air and using: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation type="unfinished"/> </message> @@ -7416,7 +7632,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -7621,23 +7837,23 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Uygula</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Güncellemeler için otomatik denetle</translation> </message> @@ -7899,8 +8115,8 @@ Lisan: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8023,21 +8239,12 @@ Ortalama</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8368,8 +8575,8 @@ Ortalama</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8454,15 +8661,10 @@ Ortalama</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> - <source>(%s) or (%s)</source> - <translation>(%s) veya (%s)</translation> - </message> - <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>hava</translation> </message> @@ -8472,27 +8674,27 @@ Ortalama</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>entegre</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>kemer</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>ayak bileği</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>klipsli</translation> </message> @@ -8675,23 +8877,23 @@ Ortalama</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>bilinmeyen</translation> @@ -8833,93 +9035,93 @@ Ortalama</translation> <translation>Gaz karışımı ayrıştırma hatası</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Veri kaydedilirken hata</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Örnekleri ayrıştırma hatası</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Olay: kullanıcı eylemi bekleniyor</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Olay işleyicisi kayıt hatası.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Dalış verisi içe aktarma hatası</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -8935,18 +9137,18 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -8962,21 +9164,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation>Uyarı:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation type="unfinished"/> @@ -8992,431 +9194,463 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>derinlik</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>süre</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>çalışma süresi</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>gaz</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3ddak</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>MSS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OZB</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="486"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>%s gaz bulunamıyor</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>MSS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %udak @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1427"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>YZ: %udak </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>YZ: %udak (hesap) </translation> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation type="unfinished"/> </message> @@ -9755,6 +9989,31 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation type="unfinished"/> @@ -9790,97 +10049,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(dalış yok)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Pazar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Pazartesi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Salı</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Çarşamba</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Perşembe</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Cuma</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Cumartesi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Ocak</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Şubat</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Mart</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Nisan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Mayıs</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Haziran</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Temmuz</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Ağustos</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Eylül</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Ekim</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Kasım</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Aralık</translation> </message> @@ -10105,6 +10364,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Süre:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>dak</translation> @@ -10210,7 +10470,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Derinlik</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation type="unfinished"/> </message> @@ -10250,22 +10510,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> @@ -10278,117 +10538,117 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation>Ayarlar</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation type="unfinished"/> </message> @@ -10491,51 +10751,56 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>dak</translation> </message> @@ -10555,153 +10820,153 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> + <source>Safety stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> - <source>Safety stop</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> + <source>Conservatism level</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> - <source>Conservatism level</source> + <source>+</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> - <source>+</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation>Gaz seçenekleri</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>EFDüşük</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>EFYüksek</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Notlar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts index ceab6ba96..fb7f28304 100644 --- a/translations/subsurface_vi.ts +++ b/translations/subsurface_vi.ts @@ -10549,11 +10549,6 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="156"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> @@ -10589,6 +10584,11 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation type="unfinished"/> diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts index d4a0c8280..e1aaf0a51 100644 --- a/translations/subsurface_zh_TW.ts +++ b/translations/subsurface_zh_TW.ts @@ -17,7 +17,7 @@ <message> <location filename="../mobile-widgets/qml/About.qml" line="37"/> <source>View your dive logs while on the go.</source> - <translation>外出時查看潛水日誌.</translation> + <translation>旅途中查看潛水日誌.</translation> </message> <message> <location filename="../mobile-widgets/qml/About.qml" line="48"/> @@ -36,7 +36,7 @@ <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="54"/> <source>Navigate Back</source> - <translation type="unfinished"/> + <translation>導航返回</translation> </message> </context> <context> @@ -47,66 +47,86 @@ <translation>選取遠端藍芽裝置</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>發現的裝置</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>儲存</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>結束</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation>藍芽模式</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation>自動</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation>Force LE</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation>Force classical</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>掃描</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>清除</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>本地端藍芽裝置細節</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>名稱: </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>地址: </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>開啟藍芽電源</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>開啟/關閉</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>選擇裝置: </translation> @@ -117,22 +137,22 @@ <translation>名稱: </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation>Winsock 2.2 無法成功初始化</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation>嘗試開啟本地端藍芽裝置...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation>嘗試關閉本地端藍芽裝置...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation>遠端裝置表單被清除. </translation> </message> @@ -164,22 +184,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation>未配對</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation>配對</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation>合法配對</translation> </message> @@ -189,113 +209,113 @@ <translation>%1 (%2) [狀態: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>裝置 %1 可接受連線. 按下儲存按鈕繼續. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>裝置 %1 必須被配對後才能使用. 請於選單找尋配對選項. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation>裝置需要為非空白位置來進行連結. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation>本地端裝置被改變. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation>配對</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation>移除配對</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation>嘗試配對裝置 %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation>嘗試中止配對裝置 %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation>裝置 %1 未配對. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation>裝置 %1 已配對. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation>裝置 %1 已配對且授權成功. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>裝置 %1 現在已可接受連線. 可按下儲存按鈕繼續. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation>本地端裝置錯誤: %1. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>配對錯誤. 若是遠端裝置需要自定 PIN 碼, 請嘗試於您的作業系統先進行配對. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation>未知錯誤</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>藍芽配接器電源已被關閉, 請開啟電源以進行搜尋. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>寫入或讀出裝置造成錯誤. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation>發生未知錯誤. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation>裝置發生錯誤: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>不可用</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>無法連接本地端藍芽配接器. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>因為位址 %1 無法符合本地端藍芽裝置的實體配接器位置, 裝置代理無法被建立. </translation> </message> @@ -316,7 +336,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>無潛伴</translation> </message> @@ -359,7 +379,7 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> <source>Register</source> - <translation type="unfinished"/> + <translation>註冊</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> @@ -369,12 +389,12 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> <source>Sign-in or Register</source> - <translation type="unfinished"/> + <translation>登入或註冊</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> <source>No cloud mode</source> - <translation type="unfinished"/> + <translation>無雲端模式</translation> </message> </context> <context> @@ -382,7 +402,7 @@ <message> <location filename="../core/cloudstorage.cpp" line="65"/> <source>Cloud account verification required, enter PIN in preferences</source> - <translation type="unfinished"/> + <translation>雲端帳號需要認證, 請於設置頁面輸入密碼</translation> </message> </context> <context> @@ -470,7 +490,7 @@ <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>Tags</source> - <translation>標籤</translation> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> @@ -1636,84 +1656,84 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>備份潛水電腦設定</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> - <translation>備份檔案 (*.xml)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> + <translation>備份檔案</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>XML備份錯誤</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>儲存備份檔案時發生錯誤。 %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>備份成功</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>設定會儲存至：%1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>還原潛水電腦設定</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>XML還原錯誤</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>還原備份檔案時發生錯誤。 %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>還原成功</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>設定被還原成功．</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>選擇韌體檔案</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> - <translation>所有檔案 (*.*)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> + <translation>全部檔案</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> - <translation>選取潛水電腦下載日誌檔案</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> + <translation>日誌檔案</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> - <translation>記錄檔 (*.log)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> + <translation>選取潛水電腦下載日誌檔案</translation> </message> </context> <context> @@ -1793,27 +1813,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>於此處按下將移除此氣瓶.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>減壓氣體交換深度. 除非手動計算, 請優先使用減壓 pO₂ 計算. </translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>計算優先使用置底 pO₂. 設定 MOD 自動調整 O₂% , 根據最大深度取得 '*' 最佳 O₂%. </translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>計算最佳 Mix END優先. 設定 MHD 自動調整 He%, 根據最大深度取得 '*' 最佳 He%.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>此氣瓶仍在使用中，在潛水中，只有未使用的氣瓶可被移除。</translation> </message> @@ -1927,27 +1947,27 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation>潛水細節</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>刪除此潛水</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> - <translation type="unfinished"/> + <translation>取消編輯</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation>顯示於地圖</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation>複數潛伴</translation> </message> @@ -1955,104 +1975,104 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation>Dive %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>日期:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>位置:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation>座標:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation>使用目前 GPS位置:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>深度:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>時間:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>氣溫:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>水溫:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>防寒衣：</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>潛伴:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>潛導：</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>重量:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation>氣瓶:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation>氣體混合:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation>起始壓力:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation>結束壓力:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>評分:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> - <translation type="unfinished"/> + <translation>能見度:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>記錄:</translation> </message> @@ -2097,7 +2117,7 @@ GPS位置:</translation> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> - <translation type="unfinished"/> + <translation>能見度:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> @@ -2128,23 +2148,23 @@ GPS位置:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation> (cyl. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>手動切換至 OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation>開始</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation>結束</translation> @@ -2309,12 +2329,12 @@ GPS位置:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>建立新的潛點, 從潛水紀錄複製相關資訊. </translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation>以此名稱建立新的潛點</translation> </message> @@ -2559,76 +2579,76 @@ GPS位置:</translation> <translation>依照 TeX 巨集寫入潛水記錄至檔案. </translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>匯出 UDDF 檔案為</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>UDDF 檔案 (*.uddf *.UDDF)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <source>UDDF files</source> + <translation>UDDF檔案</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> - <translation>匯出 CSV 檔案為</translation> + <source>CSV files</source> + <translation>CSV檔案</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>CSV 檔案 (*.csv *.CSV)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <source>HTML files</source> + <translation>HTML檔案</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> - <translation>匯出地圖</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Subsurface files</source> + <translation>Subsurface檔案</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>HTML 檔案 (*.html)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>TeX files</source> + <translation>TeX檔案</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> - <translation>匯出 Subsurface XML</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <source>Export CSV file as</source> + <translation>匯出 CSV 檔案為</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>XML 檔案 (*.xml *.ssrf)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <source>Export world map</source> + <translation>匯出地圖</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <source>Export Subsurface XML</source> + <translation>匯出 Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>儲存影像深度</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>輸出 TeX 檔案</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> - <translation>TeX 檔案 (*.tex)</translation> - </message> - <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>匯出 HTML 檔案為</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>請稍待, 匯出中...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>無法開啟檔案 %s</translation> </message> @@ -2923,7 +2943,7 @@ GPS位置:</translation> <translation><numerusform>(%n dive(s))</numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation>複數潛伴</translation> </message> @@ -2969,41 +2989,61 @@ GPS位置:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>未知</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> - <translation type="unfinished"/> + <translation>氣瓶</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>最後深度</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>持續時間</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>區間</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>使用氣量</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>CC 設定點</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3036,107 +3076,107 @@ GPS位置:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>深度</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>時間</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>壓力</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>溫度</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>顔色</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>使用者輸入</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>壓力S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>壓力I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>上限深度</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>耗氣率</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>環境壓力</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>心率</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>梯度因子</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>平均深度 @ s</translation> </message> @@ -3456,71 +3496,71 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>下載</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation>選擇藍芽下載模式</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> - <translation type="unfinished"/> + <translation>與潛水電腦連結</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>錯誤</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>搜索Uemis潛水設備</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation>取消下載</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation>選取潛水電腦下載日誌檔案</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> + <translation>日誌檔案</translation> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation>選取潛水電腦二進制資料檔</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> - <translation>重試下載</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> + <translation>傾印檔案</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> - <translation>記錄檔 (*.log)</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> + <translation>重試下載</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>提醒</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>儲存潛水電腦傾印資訊並不會下載潛水記錄</translation> </message> - <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> - <translation>傾印檔 (*bin)</translation> - </message> </context> <context> <name>DownloadFromDiveComputer</name> @@ -3589,7 +3629,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>下載</translation> </message> @@ -3615,7 +3655,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>取消</translation> </message> @@ -3627,7 +3667,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="21"/> <source>Bluetooth is not enabled</source> - <translation type="unfinished"/> + <translation>藍芽未被啟用</translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> @@ -3642,40 +3682,40 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> - <translation type="unfinished"/> + <translation>連線:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>重試</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>結束</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>下載潛水</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation>資訊:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>同意</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>選擇全部</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>取消選取</translation> </message> @@ -3706,12 +3746,12 @@ p, li { white-space: pre-wrap; } <translation>連結至Facebook張貼</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>從Facebook帳號中斷Subsurface連接, 改以使用選單"分享"進入. </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>請先登入連結 Facebook 帳號。來啟動 Subsurface 發布潛水記錄至您的時間表</translation> </message> @@ -3721,22 +3761,22 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> - <translation type="unfinished"/> + <translation>Facebook登入成功</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> - <translation type="unfinished"/> + <translation>錯誤, 未知使用者 ID, 無法登入</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> - <translation type="unfinished"/> + <translation>日誌上傳至Facebook成功</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> - <translation type="unfinished"/> + <translation>上傳潛水失敗. 請確認除錯輸出並傳送至 Subsurface 郵件名單</translation> </message> </context> <context> @@ -3801,7 +3841,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/ForwardButton.qml" line="50"/> <source>Navigate Forward</source> - <translation type="unfinished"/> + <translation>導航前進</translation> </message> </context> <context> @@ -3905,7 +3945,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation>無位置組合</translation> </message> @@ -3962,6 +4002,11 @@ p, li { white-space: pre-wrap; } <source>Country</source> <translation>國家</translation> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> + <translation type="unfinished"/> + </message> </context> <context> <name>LocationInformationModel</name> @@ -3985,29 +4030,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation>潛點管理</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> <translation>合併至此潛點</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> <translation>合併潛點</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation>您正要進行合併潛點, 此動作無法被還原. 請注意是否要繼續? </translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation>您正在編輯潛點</translation> </message> @@ -4025,8 +4070,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>記錄</translation> </message> @@ -4047,19 +4092,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>氣溫</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>水溫</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>位置</translation> </message> @@ -4124,123 +4169,123 @@ p, li { white-space: pre-wrap; } <translation>區間</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation>額外資訊</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>資訊</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation>統計</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>照片</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation>套用變更</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation>取消變更</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>氣瓶</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation>新增氣瓶</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>配重</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation>新增配重系統</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation>OC</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation>自由潛水</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>氣溫 [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>水溫 [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>此旅程已被編輯.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>此些旅程已被編輯.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>此潛水已被編輯.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>旅程筆記</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>旅程位置</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation>新的潛點</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>取消變更？</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation>您將要放棄您的變更。</translation> </message> @@ -4253,451 +4298,451 @@ p, li { white-space: pre-wrap; } <translation>檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>日誌</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>檢視</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>幫助</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>匯入</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation>編輯</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> <translation>分享到</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>建立新日誌</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>建立</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>開啟日誌</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>開啟</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>儲存</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>儲存</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>另存為</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>另存為</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>關閉</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>關閉</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>列印</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>設置</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>結束</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>從潛水電腦匯入</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>自 Subsurface 網路服務匯入 GPS 資料</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> <translation>編輯裝置名稱</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>新增潛水</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation>編輯潛水</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation>拷貝潛水配件</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation>貼上潛水配件</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>重新編號</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>自動群組</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>年統計</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>潛水列表</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>描述</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>資訊</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>全部</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation>上一個 DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation>下一個 DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>關於 Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation>使用者說明</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> - <translation type="unfinished"/> + <translation>地圖</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>計畫潛水</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>匯入日誌檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>從其他程序導入潛水檔案文件</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>自 Divelogs.de 匯入</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>全螢幕</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>切換為全螢幕</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation>檢查有無更新</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>匯出</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation>匯出潛水記錄</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation>潛水電腦設定</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation>編輯潛水計畫</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation>切換pO₂圖表</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation>切換pN₂圖表</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>切換 pHe 圖表</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation>切換 DC 回報的上限深度</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation>切換計算的上限深度</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation>切換計算所有的組織</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>切換以每次增加 3m 計算的上限深度</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>切換心跳率</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>切換 MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>切換 EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation>切換 NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation>切換 SAC 率</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation>切換規則</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation>調整圖表比例</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation>切換圖片</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> - <translation>切換氣體壓力</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation>過濾潛水列表</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation>切換組織熱度圖</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation>使用者自訂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>復原</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>取消還原</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation>搜尋移動的照片</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation>開啟雲端裝置</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation>儲存至雲端裝置</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation>管理潛點</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation>潛點編輯</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation>取用線上雲端儲存</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>連結至</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>從中斷</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>在開啟新檔前，請儲存或取消此次潛水的編輯。</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>開啟檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>取消</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> - <translation type="unfinished"/> + <translation>無法上傳空白日誌至雲端</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>經過照片路徑</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>掃描</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>掃描影像...(需要稍待一段時間)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>提醒</translation> </message> @@ -4707,105 +4752,229 @@ p, li { white-space: pre-wrap; } <translation>以 %1 min 時間區間嘗試合併潛水記錄</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <source>Template backup created</source> + <translation>儲存備份範本</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation>下方備份列印範本會被建立: + +%1 + +位置: +%2 + +請注意此版本 Subsurface 的預設範本是唯讀, +且是自程式啟動覆蓋設定後, 無法直接編輯.</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>在關閉檔案前，請儲存或取消此次潛水的編輯。</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>在新增潛水前，請先儲存或取消此次潛水的編輯。</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>列印操作表格</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>嘗試針對非原計畫的潛水進行重新規畫. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>請在嘗試其他編輯時先完成當前編輯</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>嘗試編輯非手動建立的潛水記錄. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>年統計</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <source>Dive log files</source> + <translation>潛水日誌檔案</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <source>Subsurface files</source> + <translation>Subsurface檔案</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>Cochran</source> + <translation>Cochran</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>DiveLogs.de</source> + <translation>DiveLogs.de</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>JDiveLog</source> + <translation>JDiveLog</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>Liquivision</source> + <translation>Liquivision</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>Suunto</source> + <translation>Suunto</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>UDCF</source> + <translation>UDCF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <source>XML</source> + <translation>XML</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <source>Divesoft</source> + <translation>Divesoft</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <source>Datatrak/WLog</source> + <translation>Datatrak/WLog</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <source>MkVI files</source> + <translation>MkVI檔案</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <source>APD log viewer</source> + <translation>APD日誌瀏覽器</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <source>OSTCtools</source> + <translation>OSTC工具</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <source>DAN DL7</source> + <translation>DAN DL7</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>CSV</source> + <translation>CSV</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <source>All files</source> + <translation>全部檔案</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>您是否要對檔案 %1 所做的修改儲存? </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>您是否要對資料檔案所做的修改進行儲存? </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>儲存變更? </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <source>Changes will be lost if you don't save them.</source> <translation>如果不進行儲存，所做變更將會遺失。</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>另存新檔</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[本地端暫存] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[雲端裝置] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>從較舊的版本中開啟資料檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>自舊版的 Subsurface 開啟資料檔案. 建議請先在新版程式中, 閱讀相關變更, 特別是有關潛點管理的部分. Subsurface 已嘗試預先填寫部分資料, 值得花些時間看看新的潛點管理系統, 並確認資料是否正確. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>打開潛水日誌檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation>潛水日誌檔案 (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran 檔案 (*.can *.CAN);;CSV 檔案 (*.csv *.CSV);;DiveLog.de 檔案 (*.dld *.DLD);;JDiveLog 檔案 (*.jlb *.JLB);;Liquivision 檔案 (*.lvd *.LVD);;MkVI 檔案 (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft 檔案 (*.dlf *.DLF);;UDDF/UDCF 檔案 (*.uddf *.udcf *.UDDF *.UDCF);;XML 檔案 (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog 檔案 (*.log *.LOG);;OSTCtools 檔案 (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;所有檔案 (*)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>聯絡雲端服務...</translation> </message> @@ -4813,41 +4982,42 @@ Subsurface 已嘗試預先填寫部分資料, 值得花些時間看看新的潛 <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> - <translation type="unfinished"/> + <translation>拖移選取的潛點位置</translation> </message> </context> <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> - <translation type="unfinished"/> + <translation>在Google Maps開啟位置</translation> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> - <translation type="unfinished"/> + <translation>複製位置到剪貼簿 (十進制)</translation> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> - <translation type="unfinished"/> + <translation>複製位置到剪貼簿 (六十進制)</translation> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> - <translation type="unfinished"/> + <translation>選取可見的潛點位置</translation> </message> </context> <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> - <translation type="unfinished"/> + <translation>MapWidget.qml 載入錯誤! +QML 組件 QtPositioning 和 QtLocation 可能遺失!</translation> </message> </context> <context> @@ -4896,8 +5066,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> - <translation>韌體程式檔案 (*.hex *.bin)</translation> + <source>Firmware files</source> + <translation>韌體檔案</translation> </message> </context> <context> @@ -4905,105 +5075,105 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="26"/> <source>Page 1</source> - <translation type="unfinished"/> + <translation>頁面 1</translation> </message> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="37"/> <source>Text Field</source> - <translation type="unfinished"/> + <translation>字串欄位</translation> </message> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="42"/> <source>Press Me</source> - <translation type="unfinished"/> + <translation>請點選</translation> </message> </context> <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>開放式</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>上一次在20英呎停留</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% avg. depth to 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>水面下 20 英尺</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Last stop at 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% avg. depth to 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>水面下 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -5117,8 +5287,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation>Subsurface檔案</translation> </message> </context> <context> @@ -5131,7 +5301,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> <source>Dive site layout</source> - <translation type="unfinished"/> + <translation>潛點排版</translation> </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> @@ -5332,33 +5502,33 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>日期格式</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation><html><head/><body><p>喜好資料格式. 一般常用欄位是</p><p>d (日, 該月日期)</p><p>ddd (日期縮寫)</p><p>M (月份)</p><p>MMM (月份縮寫)</p><p>yy/yyyy (年, 2/4 位數)</p></body></html></translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation>使用預設 UI 語言</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation>用於無多餘空間顯示完整日期處</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation>簡略模式</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation>時間格式</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation><html><head/><body><p>優先選擇時間格式</p><p>一般使用格式為</p><p>h (12小時制)</p><p>H (24小時制)</p><p>mm (2 位數分鐘)</p><p>ss (2 位數秒)</p><p>t/tt (a/p 或 am/pm)</p></body></html></translation> </message> @@ -5368,30 +5538,41 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>語言</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation>需要重新啟動</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>您必須重新啟動 Subsurface 來正確載入新的語言。</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation>會採用原始設定. 這可能與期望不符合. . +請查閱 http://doc.qt.io/qt-5/qdatetime.html#toString</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation>文字字母</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> - <translation>時間格式中無法使用特別字元 (字串). -會以此修正設定. 可能與期望設定無法完全相同. -請查閱 http://doc.qt.io/qt-5/qdatetime.html#toString</translation> +</source> + <translation>時間格式內無特殊字元(s). +</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> + <translation>日期格式內無特殊字元(s). +</translation> </message> </context> <context> @@ -5523,12 +5704,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> - <translation type="unfinished"/> + <translation>Subsurface 雲端空間 (密碼錯誤)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> - <translation type="unfinished"/> + <translation>Subsurface 雲端空間 (需要密碼)</translation> </message> </context> <context> @@ -5691,12 +5872,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> <source>Dive list table</source> - <translation type="unfinished"/> + <translation>潛水日誌列表</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> <source>Show units in dive list table</source> - <translation type="unfinished"/> + <translation>在潛水日誌列表顯示單位</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> @@ -5801,45 +5982,70 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation>唯讀範本!</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and cannot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>匯入樣板檔案</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> - <translation>HTML 檔案 (*.html)</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation>HTML檔案</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation>目標範本 '%1' 是唯讀且無法被覆寫.</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>匯出樣板檔案至</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation>此動作無法完成! </translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>刪除樣板: %1? </translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation>是否刪除範本 '%1'?</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation>範本 '%1' 唯讀無法刪除</translation> </message> </context> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (#%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>未知的潛水電腦</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>當超過處理時間，顯示關閉 NDL / TTS</translation> </message> @@ -5849,22 +6055,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>增加氣瓶交換</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation> (Tank %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>設定優先潛水電腦</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation>計畫潛水</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation>手動新增潛水</translation> </message> @@ -5874,6 +6075,11 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>刪除此潛水電腦</translation> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation> (cyl. %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>增加設置點變更</translation> @@ -5906,8 +6112,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> - <translation>調整氣瓶 %1 壓力 (以 %2 插入目前位置)</translation> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> + <translation>調整氣瓶壓力 %1 (目前添加為 %2)</translation> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> @@ -5953,147 +6159,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation>開始...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation>開啟本機端潛水資料檔</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation>開啟本機端檔案失敗</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 潛水記錄載入自本機端潛水資料檔案</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation>於非雲端模式工作</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation>本機端解析錯誤, 中斷</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation>無雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation>請輸入合法的雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>雲端裝置 email 與密碼只接受使用字母, 數字, 與 '.', '-', '_', 和 '+'. </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> - <translation type="unfinished"/> + <translation>錯誤的email格式</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation>嘗試使用新的憑證開啟雲端儲存</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation>測試雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation>雲端伺服器認證憑證無回應</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> - <translation type="unfinished"/> + <translation>不正確的雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>無法連結雲端儲存 - 未認證的帳號</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation>不合法的雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>無法開啟雲端儲存: 建立 https 連線錯誤</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation>無法開啟雲端儲存: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation>無法連結雲端儲存</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation>雲端認證成功, 載入日誌</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation>雲端儲存錯誤: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>從本機端載入日誌 (本機模式)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>連結雲端伺服器失敗, 返回非雲端狀態</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>成功開啟雲端儲存. 列表無潛水記錄. </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> <translation>未知的GPS位置</translation> </message> @@ -6191,7 +6397,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6199,7 +6405,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation>h</translation> </message> @@ -6207,7 +6413,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation>sec</translation> </message> @@ -6254,7 +6460,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../core/divesite.cpp" line="20"/> <source>No dive site layout categories set in preferences!</source> - <translation type="unfinished"/> + <translation>設置頁面裡無潛點輸出類別設定</translation> </message> <message> <location filename="../core/divesite.cpp" line="28"/> @@ -6349,32 +6555,32 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Undefined</source> - <translation type="unfinished"/> + <translation>未定義</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> <source>Incorrect username/password combination</source> - <translation type="unfinished"/> + <translation>不正確的帳號/密碼組合</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> <source>Credentials need to be verified</source> - <translation type="unfinished"/> + <translation>需要檢查憑證</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> <source>Credentials verified</source> - <translation type="unfinished"/> + <translation>憑證已確認</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>No cloud mode</source> - <translation type="unfinished"/> + <translation>無雲端模式</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="30"/> <source>Cloud status</source> - <translation type="unfinished"/> + <translation>雲端狀態</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="38"/> @@ -6384,12 +6590,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="44"/> <source>Not applicable</source> - <translation type="unfinished"/> + <translation>不適合</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="52"/> <source>Change</source> - <translation type="unfinished"/> + <translation>變更</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="59"/> @@ -6453,7 +6659,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="322"/> <source>Save detailed log</source> - <translation type="unfinished"/> + <translation>儲存詳細日誌</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="345"/> @@ -6463,7 +6669,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="354"/> <source>Display Developer menu</source> - <translation type="unfinished"/> + <translation>顯示開發者選單</translation> </message> </context> <context> @@ -6534,8 +6740,8 @@ Not all images have timestamps in the range between </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> - <translation>影像檔案 (*.jpg *.jpeg)</translation> + <source>Image files</source> + <translation>影像檔案</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> @@ -6649,8 +6855,8 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> - <translation>匯入訊息 (錯誤, 警告, 其它)</translation> + <source>Import messages (errors, warnings, etc)</source> + <translation>重要訊息 (錯誤, 警告, 其它)</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/> @@ -6659,81 +6865,87 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> - <translation>SmartTrak 檔案 (*.slg *.SLG);;所有檔案 (*)</translation> + <source>SmartTrak files</source> + <translation>SmartTrak檔案</translation> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> - <translation>打開 Subsurface 檔案</translation> + <source>All files</source> + <translation>全部檔案</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> - <translation>Subsurface 檔案 (*.ssrf *SSRF *.xml *.XML);;所有檔案 (*)</translation> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> + <translation>Subsurface檔案</translation> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> + <translation>打開 Subsurface 檔案</translation> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> - <translation type="unfinished"/> + <translation>小</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation>中</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation>潛水日期: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation>時間: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation>潛水地點: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation>潛伴: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation>潛導: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation> @@ -6750,7 +6962,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="26"/> <source>Small</source> - <translation type="unfinished"/> + <translation>小</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="31"/> @@ -6760,12 +6972,12 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="36"/> <source>Big</source> - <translation type="unfinished"/> + <translation>大</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="44"/> <source>The text to the right will be posted as the description with your dive profile graph to Facebook. The album name is required (the profile graph will be posted to that album).</source> - <translation type="unfinished"/> + <translation>右邊內容會隨著潛水記錄圖表, 發布至Facebook. 需要相簿名稱 (潛水記錄圖表將會發布至相簿).</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="57"/> @@ -6820,7 +7032,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="136"/> <source>Image Size</source> - <translation type="unfinished"/> + <translation>影像大小</translation> </message> </context> <context> @@ -6828,12 +7040,12 @@ Files with inappropriate date/time</source> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> - <translation type="unfinished"/> + <translation>搭配Subsurface雲端使用Subsurface-mobile, 請輸入您的雲端憑證.<br/><br/>若這是您第一次使用Subsurface雲端空間, 請輸入合法 email (全部小寫) 與選擇的密碼 (字母與數字).<br/><br/>在Subsurface-mobile上使用裝置的本機端資料, 請選擇上方的無雲端按鈕. </translation> </message> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> - <translation type="unfinished"/> + <translation>感謝您註冊 Subsurface. 我們傳送密碼 <b>%1</b> 來完成註冊. 如果在15分鐘內未收到 email, 請確認輸入的 email 地址是否正確, 與 email 的垃圾郵件信箱.<br/><br/>有關雲端帳號設定的任何問題, 請在使用者論壇直接與我們聯絡 (https://subsurface-divelog.org/user-forum/).<br/><br/></translation> </message> </context> <context> @@ -6928,7 +7140,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation>無套裝組合</translation> </message> @@ -7054,32 +7266,32 @@ Files with inappropriate date/time</source> <translation>照片</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>從多檔案載入圖片</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>從網路載入圖片</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>刪除選取的影像</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>刪除全部影像</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>刪除影像</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>你確定要刪除所有的影像? </translation> </message> @@ -7257,7 +7469,7 @@ mixed from Air and using: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>空標籤</translation> </message> @@ -7661,24 +7873,24 @@ mixed from Air and using: <translation>主機回傳下列資訊：</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface每兩周會定期是否有新版本更新. 如果不希望Subsurface持續檢查, 請點選拒絕. </translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>取消</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>同意</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>自動更新檢查</translation> </message> @@ -7940,8 +8152,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation>無錯誤</translation> </message> @@ -8065,22 +8277,12 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation>檔頭解析錯誤</translation> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation>密度: %.1fg/ℓ -</translation> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8412,8 +8614,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>氧氣</translation> </message> @@ -8498,15 +8700,10 @@ Maximum</source> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> - <source>(%s) or (%s)</source> - <translation>(%s) 或 (%s)</translation> - </message> - <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>air</translation> </message> @@ -8516,27 +8713,27 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>整合型</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>配重帶</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>腳踝</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation>背飛</translation> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>吊掛式</translation> </message> @@ -8610,7 +8807,7 @@ Maximum</source> <message> <location filename="../core/file.c" line="950"/> <source>No dive profile found from '%s'</source> - <translation type="unfinished"/> + <translation>'%s' 無潛水資料</translation> </message> <message> <location filename="../core/git-access.c" line="56"/> @@ -8719,23 +8916,23 @@ Maximum</source> <translation>雲端空間同步結束</translation> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation>錯誤連結至 Subsurface 雲端裝置</translation> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation>git clone %s 失敗 (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation>同步資料檔案</translation> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>未知</translation> @@ -8877,75 +9074,77 @@ Maximum</source> <translation>混合氣體解析錯誤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>無法建立解析 %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>錯誤的登錄資料</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>樣本解析錯誤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation>已自 %s 下載潛水</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>事件: 等待使用者動作</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation>機型=%s 韌體=%u 序號=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>錯誤的註冊程序.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>錯誤的註冊取消程序.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>匯入潛水資料錯誤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>無法建立 libdivecomputer 上下文</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation> 無法開啟 %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> - <translation type="unfinished"/> + <translation>開啟裝置錯誤 %s %s (%s). +在多數情況下, 為了追蹤此問題, libdivecomputer 日誌檔案是有幫助的. +您可以在下載頁面勾選相對應的選項, 來建立日誌檔案.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> - <translation type="unfinished"/> + <translation>潛水電腦無新的潛水日誌下載</translation> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>此潛點有複數個 GPS位置; 並 %s @@ -8953,19 +9152,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation>潛點別名: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation>自本機端載入潛水</translation> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation>成功開啟潛水資料</translation> </message> @@ -8981,19 +9180,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>錯誤 - %s - 解析潛水 %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation>有問題的讀取比例 %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation>無法解析訊息 '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation>無法開啟樣式 %s</translation> </message> @@ -9012,8 +9211,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation>提醒:</translation> </message> @@ -9039,16 +9238,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation><div>Runtime: %dmin</div><br></translation> @@ -9138,12 +9327,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <message> <location filename="../core/plannernotes.c" line="433"/> <source>Minimum gas</source> - <translation type="unfinished"/> + <translation>最低氣源</translation> </message> <message> <location filename="../core/plannernotes.c" line="434"/> <source>based on</source> - <translation type="unfinished"/> + <translation>根據</translation> </message> <message> <location filename="../core/plannernotes.c" line="436"/> @@ -9151,6 +9340,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>耗氣率</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s 計畫上升期間)</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation>%.0f%s of <span style='color: red;'><b>%s</b></span></translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9173,6 +9377,16 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>潛水計畫 </b> 建立於</translation> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation>潛水計畫</b> (偵測到潛水重疊)</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>減壓模型: Bühlmann ZHL-16C 以 GFLow = %d%% 與 GFHigh = %d%%</translation> @@ -9218,22 +9432,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>上升所需要最少氣源已達氣瓶的起始壓力! </translation> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s 計畫上升)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation>%.0f%s (%.0f%s 根據計劃上升) of <span style='color: red;'><b>%s</b></span></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <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="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>低 pO₂ 數值 %.2f 在 %d:%02u 使用氣源 %s 停留深度 %.*f %s</translation> </message> @@ -9243,12 +9452,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>無法找到氣體 %s</translation> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9257,76 +9466,77 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation>T: %.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation>V: %.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>CNS: %u%%</translation> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar</translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar</translation> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar</translation> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>MOD: %d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>安全停留: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> - <translation type="unfinished"/> + <translation>P: %d%s (%s) +</translation> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9335,7 +9545,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9344,161 +9554,168 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1427"/> + <source>Density: %.1fg/ℓ +</source> + <translation>密度: %.1fg/ℓ +</translation> + </message> + <message> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>安全停留: 未知時間 @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation>減壓: 未知時間 @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation>減壓中 </translation> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>減壓: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation>減壓 (計算) </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation>NDL:%umin (預計) </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation>計算的上限深度 %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>組織 %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation>心率: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation>方位: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation>至此的平均深度 %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation>%s SAC: %.*f%s</translation> </message> @@ -9839,7 +10056,7 @@ EADD: %d%s / %.1fg/ℓ <message> <location filename="../core/statistics.c" line="142"/> <source>All (by type stats)</source> - <translation type="unfinished"/> + <translation>全部 (依據統計種類)</translation> </message> <message> <location filename="../core/statistics.c" line="144"/> @@ -10363,22 +10580,22 @@ Uemis Zurich 已正確插入？</translation> <translation>城市</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation>開始儲存資料</translation> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation>開始儲存潛水記錄</translation> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation>分配本機端空間成功</translation> </message> <message> - <location filename="../core/save-git.c" line="1237"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation>準備儲存資料</translation> </message> @@ -10391,124 +10608,124 @@ Uemis Zurich 已正確插入？</translation> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation>潛水列表</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> - <translation type="unfinished"/> + <translation>潛水管理</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> - <translation type="unfinished"/> + <translation>關閉定位功能</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation>設定</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation>手動增加潛水</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation>自潛水電腦下載</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>手動雲端同步</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation>離線模式</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation>啟動自動雲端同步</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>關閉雲端自動同步會使資料僅能在本機端使用. 在無網路連結情況下, 此為有效的解決對策. 若有網路連結, 需要同步資料至雲端, 請選擇 '手動雲端同步'. </translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation>幫助</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation>上傳 GPS 資料</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation>套入GPS座標點</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>下載 GPS 資料</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation>顯示 GPS 位置</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation>清除 GPS 暫存</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation>開發人員</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation>App 日誌</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation>主題資訊</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation>關於</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation>啟動位置服務</translation> </message> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/main.qml" line="28"/> <source>Hello World</source> - <translation type="unfinished"/> + <translation>您好</translation> </message> </context> <context> @@ -10604,51 +10821,56 @@ p, li { white-space: pre-wrap; } <translation>計畫</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation>Min. 當 O₂% 低於 100% 時交換</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation>VPM-B 減壓</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation>Bühlmann 減壓</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation>預留氣源</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation>當不需要停留時, 延後氣體交換</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation>只於需要的停留交換</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation>計畫後氣瓶中斷點</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>min</translation> </message> @@ -10668,153 +10890,153 @@ p, li { white-space: pre-wrap; } <translation>休閒潛水模式</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation>下降至第 1 深度</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> - <translation>最短交換時間</translation> - </message> - <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> <source>Safety stop</source> <translation>安全停留</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> <source>Conservatism level</source> <translation>保守等級</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> + <translation>潛水模式</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation>氣體選項</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> - <translation type="unfinished"/> + <translation>計算計畫的變異 (效率成本)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> - <translation type="unfinished"/> + <translation>顯示計畫變動</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation>SAC 參數</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation>在OoG後, 參考兩位潛水員可能增加的 SAC., 用於計算最小氣源. </translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation>問題解決時間</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation>在OoG後, 在最大深度的額外時間, 來計算最小氣源. </translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation>用於計算最佳混合. 在 '可用氣體' 列表中輸入氣體深度, 來選擇最佳深度, 根據 "B" (最佳氣體混合) or "BN" (最佳高氧混合)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>GFlow</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>GFhigh</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>水底耗氣率</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation>水底 pO₂</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation>最佳混合 END</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>記錄</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>在潛水計畫中，顯示停留的操作時間 (絕對時間) 。</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation>顯示運作時間</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>在潛水計畫中，顯示停留的時間 (相對時間) 。</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation>顯示分段區間</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>在潛水計畫中，列出禁飛時間或標記為提示</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation>在減壓中顯示禁飛時間</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation>逐步潛水計畫</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation>減壓 pO₂</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation>減壓 SAC</translation> </message> |